diff --git a/hushline/static/css/style.css b/hushline/static/css/style.css
index 9308fba5e..da0dbf0ac 100644
--- a/hushline/static/css/style.css
+++ b/hushline/static/css/style.css
@@ -3181,11 +3181,11 @@ li label {
   margin-bottom: 0;
 }
 
-#email_address + .toggle-ui {
-  margin-top: 1.5rem;
+#email_address ~ .toggle-ui {
+  margin-bottom: 1.5rem;
 }
 
-#email_address + .toggle-ui + .meta {
+#email_address + .meta {
   margin-top: 0.5rem;
-  margin-bottom: 1rem;
+  margin-bottom: 1.25rem;
 }
diff --git a/hushline/templates/settings/notifications.html b/hushline/templates/settings/notifications.html
index 43a922dd5..2535afb7e 100644
--- a/hushline/templates/settings/notifications.html
+++ b/hushline/templates/settings/notifications.html
@@ -51,6 +51,12 @@ <h3>Notifications</h3>
       {{ email_forwarding_form.email_address.label }}
       {{ email_forwarding_form.email_address }}
 
+      {% if default_forwarding_enabled and smtp_forwarding_message_html %}
+        <p class="meta">
+          {{ smtp_forwarding_message_html }}
+        </p>
+      {% endif %}
+
       {% if default_forwarding_enabled %}
         <div class="checkbox-group toggle-ui">
           {{ email_forwarding_form.custom_smtp_settings() }}
@@ -63,12 +69,6 @@ <h3>Notifications</h3>
         </div>
       {% endif %}
 
-      {% if default_forwarding_enabled and smtp_forwarding_message_html %}
-        <p class="meta">
-          {{ smtp_forwarding_message_html }}
-        </p>
-      {% endif %}
-
       <fieldset id="custom_smtp_settings_fields">
         {{ email_forwarding_form.smtp_settings.smtp_sender.label }}
         {{ email_forwarding_form.smtp_settings.smtp_sender }}