diff --git a/src/templates/modern/li/email.folder.contents.narrow.tpl b/src/templates/modern/li/email.folder.contents.narrow.tpl
index b206745..297cb6f 100644
--- a/src/templates/modern/li/email.folder.contents.narrow.tpl
+++ b/src/templates/modern/li/email.folder.contents.narrow.tpl
@@ -50,11 +50,11 @@
 	{/if}
 	<tr>
 		<td colspan="{if $templatePrefs.showCheckboxes}3{else}2{/if}" class="folderGroup">
-			<a style="display:block;cursor:pointer;" onclick="toggleGroup({$mailID},'{if isset($mail.groupID)}{$mail.groupID}{/if}');">&nbsp;<img id="groupImage_{$mailID}" src="{$tpldir}images/{if $smarty.cookies.toggleGroup.$mailGroupID=='closed'}expand{else}contract{/if}.png" width="11" height="11" border="0" align="absmiddle" alt="" />
-			&nbsp;{$mail.text} {if $mail.date && $mail.date!=-1}({date timestamp=$mail.date dayonly=true}){/if}</a>
+			<a style="display:block;cursor:pointer;" onclick="toggleGroup({$mailID},'{if isset($mail.groupID)}{$mail.groupID}{/if}');">&nbsp;<img id="groupImage_{$mailID}" src="{$tpldir}images/{if !empty($smarty.cookies.toggleGroup.$mailGroupID) && $smarty.cookies.toggleGroup.$mailGroupID=='closed'}expand{else}contract{/if}.png" width="11" height="11" border="0" align="absmiddle" alt="" />
+			&nbsp;{$mail.text} {if isset($mail.date) && $mail.date!=-1}({date timestamp=$mail.date dayonly=true}){/if}</a>
 		</td>
 	</tr>
-	<tbody id="group_{$mailID}" style="display:{if $smarty.cookies.toggleGroup.$mailGroupID=='closed'}none{/if};">
+	<tbody id="group_{$mailID}" style="display:{if !empty($smarty.cookies.toggleGroup.$mailGroupID) && $smarty.cookies.toggleGroup.$mailGroupID=='closed'}none{/if};">
 	{assign var=first value=false}
 	{else}
 	<tr id="mail_{$mailID}_ntr" class="{$class}">
diff --git a/src/templates/modern/li/email.folders.tpl b/src/templates/modern/li/email.folders.tpl
index edf2de4..0a17abc 100644
--- a/src/templates/modern/li/email.folders.tpl
+++ b/src/templates/modern/li/email.folders.tpl
@@ -33,7 +33,7 @@
 	</tr>
 	</thead>
 	
-	{if $sysFolderList}
+	{if !empty($sysFolderList)}
 	<tr>
 		<td colspan="7" class="folderGroup">
 			<a style="display:block;" href="javascript:toggleGroup('sys');">&nbsp;<img id="groupImage_sys" src="{$tpldir}images/contract.png" width="11" height="11" border="0" align="absmiddle" alt="" />
@@ -46,7 +46,7 @@
 	<tr>
 		<td class="{$class}" nowrap="nowrap"><input type="checkbox" disabled="disabled" /></td>
 		<td class="{$class}" nowrap="nowrap">&nbsp;<a href="email.php?sid={$sid}&folder={$folderID}"><i class="fa {if $folder.type == 'inbox'}fa-inbox{elseif $folder.type == 'outbox'}fa-inbox{elseif $folder.type == 'drafts'}fa-envelope{elseif $folder.type == 'spam'}fa-ban{elseif $folder.type == 'trash'}fa-trash-o{elseif $folder.type == 'intellifolder'}fa-folder{else}fa-folder-o{/if}" aria-hidden="true"></i> {text value=$folder.titel cut=25}</a></td>
-		<td class="{$class}" nowrap="nowrap">&nbsp;{text value=$folder.parent cut=15}</td>
+		<td class="{$class}" nowrap="nowrap">&nbsp;{if isset($folder.parent)}{text value=$folder.parent cut=15}{/if}</td>
 		<td class="{$class}" nowrap="nowrap" style="text-align:center;">
 			{size bytes=$folder.size}
 		</td>
@@ -84,7 +84,7 @@
 	<tr>
 		<td class="{$class}" nowrap="nowrap"><input type="checkbox" id="folder_{$folderID}" name="folder_{$folderID}" /></td>
 		<td class="{if $sortColumn=='titel'}listTableTDActive{else}{$class}{/if}" nowrap="nowrap">&nbsp;<a href="email.php?sid={$sid}&folder={$folderID}">{if $folder.intelligent==1}<i class="fa fa-folder" aria-hidden="true"></i>{else}<i class="fa fa-folder-o" aria-hidden="true"></i>{/if} {text value=$folder.titel cut=25}</a></td>
-		<td class="{if $sortColumn=='parent'}listTableTDActive{else}{$class}{/if}" nowrap="nowrap">&nbsp;{text value=$folder.parent cut=15}</td>
+		<td class="{if $sortColumn=='parent'}listTableTDActive{else}{$class}{/if}" nowrap="nowrap">&nbsp;{if isset($folder.parent)}{text value=$folder.parent cut=15}{/if}</td>
 		<td class="{$class}" nowrap="nowrap" style="text-align:center;">
 			{if $folder.intelligent}-{else}{size bytes=$folder.size}{/if}
 		</td>
diff --git a/src/templates/modern/li/organizer.calendar.edit.tpl b/src/templates/modern/li/organizer.calendar.edit.tpl
index fba2c1a..108595e 100644
--- a/src/templates/modern/li/organizer.calendar.edit.tpl
+++ b/src/templates/modern/li/organizer.calendar.edit.tpl
@@ -1,16 +1,16 @@
 <div id="contentHeader">
 	<div class="left">
 		<i class="fa fa-calendar" aria-hidden="true"></i>
-		{if $eDate}{lng p="editdate"}{else}{lng p="adddate"}{/if}
+		{if !empty($eDate)}{lng p="editdate"}{else}{lng p="adddate"}{/if}
 	</div>
 </div>
 
 <div class="scrollContainer"><div class="pad">
 
-<form name="f2" method="post" action="organizer.calendar.php?action={if $eDate}saveDate&id={$eDate.id}{if $smarty.get.jumpbackDate}&jumpbackDate={text value=$smarty.get.jumpbackDate allowEmpty=true}{/if}{else}createDate{/if}&sid={$sid}" onsubmit="return(checkCalendarDateForm(this));">
+<form name="f2" method="post" action="organizer.calendar.php?action={if !empty($eDate)}saveDate&id={$eDate.id}{if $smarty.get.jumpbackDate}&jumpbackDate={text value=$smarty.get.jumpbackDate allowEmpty=true}{/if}{else}createDate{/if}&sid={$sid}" onsubmit="return(checkCalendarDateForm(this));">
 	<table class="listTable">
 		<tr>
-			<th class="listTableHead" colspan="2"> {if $eDate}{lng p="editdate"}{else}{lng p="adddate"}{/if}</th>
+			<th class="listTableHead" colspan="2"> {if !empty($eDate)}{lng p="editdate"}{else}{lng p="adddate"}{/if}</th>
 		</tr>
 		
 		<tr>
@@ -32,7 +32,7 @@
 		<tr>
 			<td class="listTableLeft"><label for="text">{lng p="text"}:</label></td>
 			<td class="listTableRight">
-				<textarea style="width:100%;height:100px;" name="text" id="text">{text value=$eDate.text allowEmpty=true}</textarea>
+				<textarea style="width:100%;height:100px;" name="text" id="text">{if isset($eDate.text)}{text value=$eDate.text allowEmpty=true}{/if}</textarea>
 			</td>
 		</tr>
 		
@@ -52,11 +52,11 @@
 			<td class="listTableRight">
 				<table>
 					<tr>
-						<td><input type="radio" id="wholeDay_0" name="wholeDay" value="0"{if !$eDate || !($eDate.flags&1)} checked="checked"{/if} /></td>
+						<td><input type="radio" id="wholeDay_0" name="wholeDay" value="0"{if empty($eDate) || !($eDate.flags&1)} checked="checked"{/if} /></td>
 						<td>
-							<input type="text" onfocus="EBID('wholeDay_0').checked=true;" name="durationHours" id="durationHours" value="{$durationHours}" size="3" />
+							<input type="text" onfocus="EBID('wholeDay_0').checked=true;" name="durationHours" id="durationHours" value="{if isset($durationHours)}{$durationHours}{/if}" size="3" />
 							{lng p="hours"},
-							<input type="text" onfocus="EBID('wholeDay_0').checked=true;" name="durationMinutes" id="durationMinutes" value="{$durationMinutes}" size="3" />
+							<input type="text" onfocus="EBID('wholeDay_0').checked=true;" name="durationMinutes" id="durationMinutes" value="{if isset($durationMinutes)}{$durationMinutes}{/if}" size="3" />
 							{lng p="minutes"}
 						</td>
 					</tr>
@@ -75,7 +75,7 @@
 		<tr>
 			<td class="listTableLeft"><label for="repeating">{lng p="repeating"}?</td>
 			<td class="listTableRight">
-				<input type="checkbox" name="repeating" id="repeating"{if $eDate.repeating} checked="checked"{/if} onclick="toggleRepeatingDiv(this)" />
+				<input type="checkbox" name="repeating" id="repeating"{if isset($eDate.repeating)} checked="checked"{/if} onclick="toggleRepeatingDiv(this)" />
 				<label for="repeating">{lng p="repeating"}</label>
 			</td>
 		</tr>
@@ -90,12 +90,12 @@
 					</tr>
 					<tr>
 						<td><input type="radio" name="repeat_until" id="repeat_until_count" value="count"{if $eDate.repeat_flags&2} checked="checked"{/if} /></td>
-						<td><input type="text" size="4" name="repeat_until_count" value="{if $eDate&&$eDate.repeat_flags&2}{$eDate.repeat_times}{else}5{/if}" /> <label for="repeat_until_count">{lng p="times"}</label></td>
+						<td><input type="text" size="4" name="repeat_until_count" value="{if isset($eDate)&&$eDate.repeat_flags&2}{$eDate.repeat_times}{else}5{/if}" /> <label for="repeat_until_count">{lng p="times"}</label></td>
 					</tr>
 					<tr>
 						<td><input type="radio" name="repeat_until" id="repeat_until_date" value="date"{if $eDate.repeat_flags&4} checked="checked"{/if} /></td>
 						<td><label for="repeat_until_date">{lng p="until"}</label>
-						{if $eDate&&$eDate.repeat_flags&4}
+						{if isset($eDate)&&$eDate.repeat_flags&4}
 							{html_select_date prefix="repeat_until_date" time=$eDate.repeat_times field_order="DMY" start_year="-5" end_year="+5" field_separator="."},
 							{html_select_time prefix="repeat_until_date" time=$eDate.repeat_times minute_interval=5 display_seconds=false}
 						{else}
@@ -113,11 +113,11 @@
 					<tr>
 						<td valign="top"><input type="radio" name="repeat_interval" id="repeat_interval_daily" value="daily"{if !$eDate||$eDate.repeat_flags&8} checked="checked"{/if} /></td>
 						<td><label for="repeat_interval_daily">{lng p="every"}</label>
-							<input type="text" name="repeat_interval_daily" value="{if $eDate&&$eDate.repeat_flags&8}{$eDate.repeat_value}{else}1{/if}" size="4" />
+							<input type="text" name="repeat_interval_daily" value="{if isset($eDate)&&$eDate.repeat_flags&8}{$eDate.repeat_value}{else}1{/if}" size="4" />
 							{lng p="days"}<br />
 							{lng p="besides"}
 							{foreach from=$weekDays item=weekDay key=weekDayID}
-							<input type="checkbox" name="repeat_daily_exceptions[]"{if $eDate&&$eDate.repeat_flags&8&&$repeatExtraDays[$weekDayID]} checked="checked"{/if} value="{$weekDayID}" id="rd_ex_{$weekDayID}" />
+							<input type="checkbox" name="repeat_daily_exceptions[]"{if isset($eDate)&&$eDate.repeat_flags&8&&$repeatExtraDays[$weekDayID]} checked="checked"{/if} value="{$weekDayID}" id="rd_ex_{$weekDayID}" />
 							<label for="rd_ex_{$weekDayID}">{$weekDay}</label>
 							{/foreach}
 						</td>
@@ -125,32 +125,32 @@
 					<tr>
 						<td valign="top"><input type="radio" name="repeat_interval" id="repeat_interval_weekly" value="weekly"{if $eDate.repeat_flags&16} checked="checked"{/if} /></td>
 						<td><label for="repeat_interval_weekly">{lng p="every"}</label>
-							<input type="text" name="repeat_interval_weekly" value="{if $eDate&&$eDate.repeat_flags&16}{$eDate.repeat_value}{else}1{/if}" size="4" />
+							<input type="text" name="repeat_interval_weekly" value="{if isset($eDate)&&$eDate.repeat_flags&16}{$eDate.repeat_value}{else}1{/if}" size="4" />
 							{lng p="weeks"}</td>
 					</tr>
 					<tr>
 						<td valign="top"><input type="radio" name="repeat_interval" id="repeat_interval_monthly_mday" value="monthly_mday"{if $eDate.repeat_flags&32} checked="checked"{/if} /></td>
 						<td><label for="repeat_interval_monthly_mday">{lng p="every"}</label>
-							<input type="text" name="repeat_interval_monthly_mday" value="{if $eDate&&$eDate.repeat_flags&32}{$eDate.repeat_value}{else}1{/if}" size="4" />
+							<input type="text" name="repeat_interval_monthly_mday" value="{if isset($eDate)&&$eDate.repeat_flags&32}{$eDate.repeat_value}{else}1{/if}" size="4" />
 							{lng p="months"} {lng p="at"}
-							<input type="text" name="repeat_interval_monthly_mday_extra1" value="{if $eDate&&$eDate.repeat_flags&32}{$eDate.repeat_extra1}{else}1{/if}" size="4" />.
+							<input type="text" name="repeat_interval_monthly_mday_extra1" value="{if isset($eDate)&&$eDate.repeat_flags&32}{$eDate.repeat_extra1}{else}1{/if}" size="4" />.
 							{lng p="ofthemonth"}</td>
 					</tr>
 					<tr>
 						<td valign="top"><input type="radio" name="repeat_interval" id="repeat_interval_monthly_wday" value="monthly_wday"{if $eDate.repeat_flags&64} checked="checked"{/if} /></td>
 						<td><label for="repeat_interval_monthly_wday">{lng p="every"}</label>
-							<input type="text" name="repeat_interval_monthly_wday" value="{if $eDate&&$eDate.repeat_flags&64}{$eDate.repeat_value}{else}1{/if}" size="4" />
+							<input type="text" name="repeat_interval_monthly_wday" value="{if isset($eDate)&&$eDate.repeat_flags&64}{$eDate.repeat_value}{else}1{/if}" size="4" />
 							{lng p="months"} {lng p="at"}
 							<select name="repeat_interval_monthly_wday_extra1">
-								<option value="0"{if $eDate&&$eDate.repeat_flags&64&&$eDate.repeat_extra1==0} selected="selected"{/if}>{lng p="first"}</option>
-								<option value="1"{if $eDate&&$eDate.repeat_flags&64&&$eDate.repeat_extra1==1} selected="selected"{/if}>{lng p="second"}</option>
-								<option value="2"{if $eDate&&$eDate.repeat_flags&64&&$eDate.repeat_extra1==2} selected="selected"{/if}>{lng p="third"}</option>
-								<option value="3"{if $eDate&&$eDate.repeat_flags&64&&$eDate.repeat_extra1==3} selected="selected"{/if}>{lng p="fourth"}</option>
-								<option value="4"{if $eDate&&$eDate.repeat_flags&64&&$eDate.repeat_extra1==4} selected="selected"{/if}>{lng p="last"}</option>
+								<option value="0"{if isset($eDate)&&$eDate.repeat_flags&64&&$eDate.repeat_extra1==0} selected="selected"{/if}>{lng p="first"}</option>
+								<option value="1"{if isset($eDate)&&$eDate.repeat_flags&64&&$eDate.repeat_extra1==1} selected="selected"{/if}>{lng p="second"}</option>
+								<option value="2"{if isset($eDate)&&$eDate.repeat_flags&64&&$eDate.repeat_extra1==2} selected="selected"{/if}>{lng p="third"}</option>
+								<option value="3"{if isset($eDate)&&$eDate.repeat_flags&64&&$eDate.repeat_extra1==3} selected="selected"{/if}>{lng p="fourth"}</option>
+								<option value="4"{if isset($eDate)&&$eDate.repeat_flags&64&&$eDate.repeat_extra1==4} selected="selected"{/if}>{lng p="last"}</option>
 							</select>
 							<select name="repeat_interval_monthly_wday_extra2">
 							{foreach from=$weekDays item=weekDay key=weekDayID}
-								<option value="{$weekDayID}"{if $eDate&&$eDate.repeat_flags&64&&$eDate.repeat_extra2==$weekDayID} selected="selected"{/if}>{$weekDay}</option>
+								<option value="{$weekDayID}"{if isset($eDate)&&$eDate.repeat_flags&64&&$eDate.repeat_extra2==$weekDayID} selected="selected"{/if}>{$weekDay}</option>
 							{/foreach}
 							</select>
 							{lng p="ofthemonth"}</td>
@@ -158,7 +158,7 @@
 					<tr>
 						<td valign="top"><input type="radio" name="repeat_interval" id="repeat_interval_yearly" value="yearly"{if $eDate.repeat_flags&128} checked="checked"{/if} /></td>
 						<td><label for="repeat_interval_yearly">{lng p="every"}</label>
-							<input type="text" name="repeat_interval_yearly" value="{if $eDate&&$eDate.repeat_flags&128}{$eDate.repeat_value}{else}1{/if}" size="4" />
+							<input type="text" name="repeat_interval_yearly" value="{if isset($eDate)&&$eDate.repeat_flags&128}{$eDate.repeat_value}{else}1{/if}" size="4" />
 							{lng p="years"}</td>
 					</tr>
 				</table>
@@ -202,31 +202,31 @@
 								<select name="reminder">
 									<optgroup label="{lng p="minutes"}">
 										<option value="5"{if !$eDate||$eDate.reminder/60==5} selected="selected"{/if}>5 {lng p="minutes"}</option>
-										<option value="15"{if $eDate.reminder/60==15} selected="selected"{/if}>15 {lng p="minutes"}</option>
-										<option value="30"{if $eDate.reminder/60==30} selected="selected"{/if}>30 {lng p="minutes"}</option>
-										<option value="45"{if $eDate.reminder/60==45} selected="selected"{/if}>45 {lng p="minutes"}</option>
+										<option value="15"{if isset($eDate.reminder) && $eDate.reminder/60==15} selected="selected"{/if}>15 {lng p="minutes"}</option>
+										<option value="30"{if isset($eDate.reminder) && $eDate.reminder/60==30} selected="selected"{/if}>30 {lng p="minutes"}</option>
+										<option value="45"{if isset($eDate.reminder) && $eDate.reminder/60==45} selected="selected"{/if}>45 {lng p="minutes"}</option>
 									</optgroup>
 									
 									<optgroup label="{lng p="hours"}">
-										<option value="60"{if $eDate.reminder/60==60} selected="selected"{/if}>1 {lng p="hours"}</option>
-										<option value="120"{if $eDate.reminder/60==120} selected="selected"{/if}>2 {lng p="hours"}</option>
-										<option value="240"{if $eDate.reminder/60==240} selected="selected"{/if}>4 {lng p="hours"}</option>
-										<option value="480"{if $eDate.reminder/60==480} selected="selected"{/if}>8 {lng p="hours"}</option>
-										<option value="720"{if $eDate.reminder/60==720} selected="selected"{/if}>12 {lng p="hours"}</option>
+										<option value="60"{if isset($eDate.reminder) && $eDate.reminder/60==60} selected="selected"{/if}>1 {lng p="hours"}</option>
+										<option value="120"{if isset($eDate.reminder) && $eDate.reminder/60==120} selected="selected"{/if}>2 {lng p="hours"}</option>
+										<option value="240"{if isset($eDate.reminder) && $eDate.reminder/60==240} selected="selected"{/if}>4 {lng p="hours"}</option>
+										<option value="480"{if isset($eDate.reminder) && $eDate.reminder/60==480} selected="selected"{/if}>8 {lng p="hours"}</option>
+										<option value="720"{if isset($eDate.reminder) && $eDate.reminder/60==720} selected="selected"{/if}>12 {lng p="hours"}</option>
 									</optgroup>
 									
 									<optgroup label="{lng p="days"}">
-										<option value="1440"{if $eDate.reminder/60==1440} selected="selected"{/if}>1 {lng p="days"}</option>
-										<option value="2880"{if $eDate.reminder/60==2880} selected="selected"{/if}>2 {lng p="days"}</option>
-										<option value="5760"{if $eDate.reminder/60==5760} selected="selected"{/if}>4 {lng p="days"}</option>
-										<option value="8640"{if $eDate.reminder/60==8640} selected="selected"{/if}>6 {lng p="days"}</option>
+										<option value="1440"{if isset($eDate.reminder) && $eDate.reminder/60==1440} selected="selected"{/if}>1 {lng p="days"}</option>
+										<option value="2880"{if isset($eDate.reminder) && $eDate.reminder/60==2880} selected="selected"{/if}>2 {lng p="days"}</option>
+										<option value="5760"{if isset($eDate.reminder) && $eDate.reminder/60==5760} selected="selected"{/if}>4 {lng p="days"}</option>
+										<option value="8640"{if isset($eDate.reminder) && $eDate.reminder/60==8640} selected="selected"{/if}>6 {lng p="days"}</option>
 									</optgroup>
 									
 									<optgroup label="{lng p="weeks"}">
-										<option value="10080"{if $eDate.reminder/60==10080} selected="selected"{/if}>1 {lng p="weeks"}</option>
-										<option value="20160"{if $eDate.reminder/60==20160} selected="selected"{/if}>2 {lng p="weeks"}</option>
-										<option value="30240"{if $eDate.reminder/60==30240} selected="selected"{/if}>3 {lng p="weeks"}</option>
-										<option value="40320"{if $eDate.reminder/60==40320} selected="selected"{/if}>4 {lng p="weeks"}</option>
+										<option value="10080"{if isset($eDate.reminder) && $eDate.reminder/60==10080} selected="selected"{/if}>1 {lng p="weeks"}</option>
+										<option value="20160"{if isset($eDate.reminder) && $eDate.reminder/60==20160} selected="selected"{/if}>2 {lng p="weeks"}</option>
+										<option value="30240"{if isset($eDate.reminder) && $eDate.reminder/60==30240} selected="selected"{/if}>3 {lng p="weeks"}</option>
+										<option value="40320"{if isset($eDate.reminder) && $eDate.reminder/60==40320} selected="selected"{/if}>4 {lng p="weeks"}</option>
 									</optgroup>
 								</select>
 								<label for="reminder">{lng p="timebefore"}</label>