diff --git a/lib/ui/settings/email_settings.dart b/lib/ui/settings/email_settings.dart
index abeff0f7d..9ac053eca 100644
--- a/lib/ui/settings/email_settings.dart
+++ b/lib/ui/settings/email_settings.dart
@@ -74,7 +74,7 @@ class _EmailSettingsState extends State<EmailSettings>
         .forEach((dynamic controller) => controller.removeListener(_onChanged));
 
     final settings = widget.viewModel.settings;
-    final signature = settings.emailFooter;
+    final signature = settings.emailFooter ?? '';
     // return NotusDocument.fromJson(jsonDecode(contents));
     _zefyrController.compose(Delta()..insert(signature));
 
@@ -135,39 +135,6 @@ class _EmailSettingsState extends State<EmailSettings>
           children: <Widget>[
             ListView(
               children: <Widget>[
-                FormCard(
-                  children: <Widget>[
-                    DecoratedFormField(
-                      label: localization.replyToEmail,
-                      controller: _replyToEmailController,
-                      keyboardType: TextInputType.emailAddress,
-                    ),
-                    DecoratedFormField(
-                      label: localization.bccEmail,
-                      controller: _bccEmailController,
-                      keyboardType: TextInputType.emailAddress,
-                    ),
-                    SizedBox(height: 10),
-                    BoolDropdownButton(
-                      label: localization.attachPdf,
-                      value: false,
-                      iconData: FontAwesomeIcons.fileInvoice,
-                      showBlank: state.settingsUIState.isFiltered,
-                    ),
-                    BoolDropdownButton(
-                      label: localization.attachDocuments,
-                      value: false,
-                      iconData: FontAwesomeIcons.fileImage,
-                      showBlank: state.settingsUIState.isFiltered,
-                    ),
-                    BoolDropdownButton(
-                      label: localization.attachUbl,
-                      value: false,
-                      iconData: FontAwesomeIcons.fileArchive,
-                      showBlank: state.settingsUIState.isFiltered,
-                    ),
-                  ],
-                ),
                 FormCard(
                   children: <Widget>[
                     InputDecorator(
@@ -212,6 +179,42 @@ class _EmailSettingsState extends State<EmailSettings>
                     ),
                   ],
                 ),
+                FormCard(
+                  children: <Widget>[
+                    DecoratedFormField(
+                      label: localization.replyToEmail,
+                      controller: _replyToEmailController,
+                      keyboardType: TextInputType.emailAddress,
+                    ),
+                    DecoratedFormField(
+                      label: localization.bccEmail,
+                      controller: _bccEmailController,
+                      keyboardType: TextInputType.emailAddress,
+                    ),
+                  ],
+                ),
+                FormCard(
+                  children: <Widget>[
+                    BoolDropdownButton(
+                      label: localization.attachPdf,
+                      value: false,
+                      iconData: FontAwesomeIcons.fileInvoice,
+                      showBlank: state.settingsUIState.isFiltered,
+                    ),
+                    BoolDropdownButton(
+                      label: localization.attachDocuments,
+                      value: false,
+                      iconData: FontAwesomeIcons.fileImage,
+                      showBlank: state.settingsUIState.isFiltered,
+                    ),
+                    BoolDropdownButton(
+                      label: localization.attachUbl,
+                      value: false,
+                      iconData: FontAwesomeIcons.fileArchive,
+                      showBlank: state.settingsUIState.isFiltered,
+                    ),
+                  ],
+                ),
               ],
             ),
             Container(