diff --git a/templates/Sparkle/customer/email/emails_add.tpl b/templates/Sparkle/customer/email/emails_add.tpl
index 730ac912..13bea014 100644
--- a/templates/Sparkle/customer/email/emails_add.tpl
+++ b/templates/Sparkle/customer/email/emails_add.tpl
@@ -1,14 +1,6 @@
 $header
 <article>
-	<if $domains == ''>
-		<div class="messagewrapperfull">
-			<div class="warningcontainer bradius">
-				<div class="warningtitle">{$lng['admin']['warning']}</div>
-				<div class="warning"><br /><strong>{$lng['emails']['noemaildomainaddedyet']}</strong></div>
-			</div>
-		</div>
-	</if>
-	<else>
+
 	<header>
 		<h2>
 			<img src="templates/{$theme}/assets/img/icons/email_add_big.png" alt="{$title}" />&nbsp;
@@ -16,24 +8,33 @@ $header
 		</h2>
 	</header>
 
-	<section class="fullform bradiusodd">
+	<if $domains == ''>
+		<div class="messagewrapperfull">
+			<div class="warningcontainer bradius">
+				<div class="warningtitle">{$lng['admin']['warning']}</div>
+				<div class="warning"><br /><strong>{$lng['emails']['noemaildomainaddedyet']}</strong></div>
+			</div>
+		</div>
+	<else>
+		<section class="fullform bradiusodd">
 
-		<form action="{$linker->getLink(array('section' => 'email'))}" method="post" enctype="application/x-www-form-urlencoded">
-			<fieldset>
-				<legend>Froxlor&nbsp;-&nbsp;{$title}</legend>
+			<form action="{$linker->getLink(array('section' => 'email'))}" method="post" enctype="application/x-www-form-urlencoded">
+				<fieldset>
+					<legend>Froxlor&nbsp;-&nbsp;{$title}</legend>
+					
+					<table class="formtable">
+						{$email_add_form}
+					</table>
 
-				<table class="formtable">
-					{$email_add_form}
-				</table>
-
-				<p style="display: none;">
-					<input type="hidden" name="s" value="$s" />
-					<input type="hidden" name="page" value="$page" />
-					<input type="hidden" name="action" value="$action" />
-					<input type="hidden" name="send" value="send" />
-				</p>
-			</fieldset>
-		</form>
-	</section>
+					<p style="display: none;">
+						<input type="hidden" name="s" value="$s" />
+						<input type="hidden" name="page" value="$page" />
+						<input type="hidden" name="action" value="$action" />
+						<input type="hidden" name="send" value="send" />
+					</p>
+				</fieldset>
+			</form>
+		</section>
+	</if>
 </article>
 $footer