diff --git a/src/templates/modern/li/email.compose.tpl b/src/templates/modern/li/email.compose.tpl
index 0152e7b..78cb321 100644
--- a/src/templates/modern/li/email.compose.tpl
+++ b/src/templates/modern/li/email.compose.tpl
@@ -156,7 +156,7 @@
 
 {hook id="email.compose.tpl:foot"}
 
-{if $captchaInfo}
+{if isset($captchaInfo)}
 <div id="safecodeFooter"{if $captchaInfo.heightHint} style="height:{$captchaInfo.heightHint};"{/if}>
 	<table cellpadding="0" style="margin-left:auto;margin-right:auto;">
 		<tr>
diff --git a/src/templates/modern/li/email.folder.contents.narrow.tpl b/src/templates/modern/li/email.folder.contents.narrow.tpl
index 7f11083..ab0d55b 100644
--- a/src/templates/modern/li/email.folder.contents.narrow.tpl
+++ b/src/templates/modern/li/email.folder.contents.narrow.tpl
@@ -49,7 +49,7 @@
 	{/if}
 	<tr>
 		<td colspan="{if $templatePrefs.showCheckboxes}3{else}2{/if}" class="folderGroup">
-			<a style="display:block;cursor:pointer;" onclick="toggleGroup({$mailID},'{$mail.groupID}');">&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="" />
+			<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>
 		</td>
 	</tr>
diff --git a/src/templates/modern/li/sms.compose.tpl b/src/templates/modern/li/sms.compose.tpl
index a6812fb..207baef 100644
--- a/src/templates/modern/li/sms.compose.tpl
+++ b/src/templates/modern/li/sms.compose.tpl
@@ -69,7 +69,7 @@
 				</td>
 			</tr>
 			
-			{if $captchaInfo}
+			{if isset($captchaInfo)}
 			<tr>
 				<td class="listTableLeft">&nbsp;</td>
 				<td class="listTableRight" id="captchaContainer">