diff --git a/src/onionrcommands/daemonlaunch/__init__.py b/src/onionrcommands/daemonlaunch/__init__.py
index b8fc50fd..10e58d98 100755
--- a/src/onionrcommands/daemonlaunch/__init__.py
+++ b/src/onionrcommands/daemonlaunch/__init__.py
@@ -101,7 +101,7 @@ def daemon():
     if config.get('general.display_header', True):
         logoheader.header("")
         if QUOTE[1]:
-            logger.info("\u001b[33m\033[F" + bordered(QUOTE[0] + '\n' + QUOTE[1]), terminal=True)
+            logger.info("\u001b[33m\033[F" + bordered(QUOTE[0] + '\n -' + QUOTE[1]), terminal=True)
         else:
             logger.info("\u001b[33m\033[F" + bordered(QUOTE[0]), terminal=True)
 
diff --git a/static-data/www/mail/closesettings.js b/static-data/www/mail/closesettings.js
index 2bef13cd..5f91cc5b 100644
--- a/static-data/www/mail/closesettings.js
+++ b/static-data/www/mail/closesettings.js
@@ -17,14 +17,12 @@
     along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-var setCloseSettingsModal = function(){
-    var closeButtonElements = document.getElementsByClassName('closeSettingsModal')
-
-    for (i = 0; i < closeButtonElements; i++){
-        closeButtonElements[i].onclick = function(){
-            document.getElementById('settingsModal').classList.remove('is-active')
-        }
-    }
+document.getElementById('closeSettingsModalButton').onclick = function(){
+    document.getElementById('settingsModal').classList.remove('is-active')
+    setActiveTab('inbox')
 }
 
-setCloseSettingsModal()
\ No newline at end of file
+document.querySelector("#settingsModal .modal-background").onclick = function(){
+    document.getElementById('settingsModal').classList.remove('is-active')
+    setActiveTab('inbox')
+}
diff --git a/static-data/www/mail/index.html b/static-data/www/mail/index.html
index 0861bbb7..c3233a6e 100755
--- a/static-data/www/mail/index.html
+++ b/static-data/www/mail/index.html
@@ -18,9 +18,9 @@
     <script defer src="/shared/main/apicheck.js"></script>
     <script defer src="/shared/misc.js"></script>
     <script defer src="/mail/sethumanreadable.js"></script>
-    <script defer src="/mail/closesettings.js"></script>
     <script defer src="/mail/mail.js"></script>
     <script defer src="/mail/sendmail.js"></script>
+    <script defer src="/mail/closesettings.js"></script>
     <script defer src="/shared/navbar.js"></script>
 </head>
 
@@ -121,7 +121,7 @@
                 <div class="field">
                     To: <input id="draftID" type="text" name="to" placeholder="pubkey or select above" required>
                 </div>
-                Subject: <input name="subject" id="draftSubject" maxlength=25 type="text"
+                Subject: <input name="subject" id="draftSubject" maxlength="25" type="text"
                     placeholder="message subject">
                 <div class="field">
                     <textarea name="message" class="textarea" placeholder="type your message..." id="draftText" required></textarea>
@@ -135,12 +135,12 @@
         <div class="modal-background"></div>
         <div class="modal-card">
           <header class="modal-card-head">
-            <button class="closeSettingsModal delete" aria-label="close"></button>
+            <button id="closeSettingsModalButton" class="closeSettingsModal delete" aria-label="close"></button>
           </header>
           <section class="modal-card-body">
               <div class="columns">
                   <div class="column">
-                      Default Forward Secrecy
+                      Default forward secrecy
                   </div>
                   <div class="column is-2">
                     <div class="field">
@@ -149,12 +149,27 @@
                         <label for="forwardSecrecySetting"></label>
                     </div>
                   </div>
+              </div>
+              <div class="columns">
                 <div class="column">
-                    Signature
+                    Keep messages when blocks are deleted
                 </div>
                 <div class="column is-2">
                   <div class="field">
-                      <textarea id="mailSignatureSetting" class="textarea" placeholder="Signature to add to every message" rows="10"></textarea>
+                      <input id="maintainMessagesSetting" type="checkbox"
+                      class="switch is-rounded">
+                      <label for="maintainMessagesSetting"></label>
+                  </div>
+                </div>
+            </div>
+              Signature
+              <textarea id="mailSignatureSetting" class="textarea" placeholder="Signature to add to every message" rows="5"></textarea>
+              <div class="columns">
+                <div class="column">
+                </div>
+                <div class="column is-2">
+                  <div class="field">
+
                   </div>
                 </div>
               </div>
diff --git a/static-data/www/mail/mail.css b/static-data/www/mail/mail.css
index 7540a417..4f778698 100755
--- a/static-data/www/mail/mail.css
+++ b/static-data/www/mail/mail.css
@@ -1,12 +1,12 @@
-.threadEntry{
-    margin-bottom: 2%;
-}
 .threadEntry button{
     margin-right: 1%;
 }
 .threadEntry span, .sentboxList span{
     padding-left: 1%;
 }
+.threadEntry, .sentboxList{
+    cursor: pointer;
+}
 
 .overlayContent{
     background-color: lightgray;
@@ -48,4 +48,10 @@
 #settingsModal .modal-card-body{
     font-size: 150%;
     min-height: 300px;
-}
\ No newline at end of file
+}
+
+#settingsModal textarea{
+    resize: none;
+    margin-top: 1em;
+}
+