diff --git a/static-data/www/mail/index.html b/static-data/www/mail/index.html
index dbe7adb9..a320f552 100755
--- a/static-data/www/mail/index.html
+++ b/static-data/www/mail/index.html
@@ -113,25 +113,6 @@
             </div>
         </div>
     </div>
-    <div id="sendMessage" class="overlay">
-        <div class="overlayContent">
-            <div class="field">
-                <label><i class="fas fa-user"></i> Select friend: <select id="friendSelect"></select></label>
-            </div>
-            <form method="post" action="" id="sendForm" enctype="application/x-www-form-urlencoded">
-                <span class="closeOverlay" overlay="sendMessage"></span>
-                <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"
-                    placeholder="message subject">
-                <div class="field">
-                    <textarea name="message" class="textarea" placeholder="type your message..." id="draftText" required></textarea>
-                </div>
-                <input type="submit" value="Send" class="button is-success successBtn">
-            </form>
-        </div>
-    </div>
 
     <div id="settingsModal" class="modal">
         <div class="modal-background"></div>
@@ -255,7 +236,24 @@
             </div>
         </div>
     </div>
-
+    <div id="sendMessage">
+        <div class="container">
+            <div class="field">
+                <label><i class="fas fa-user"></i> Select friend: <select id="friendSelect"></select></label>
+            </div>
+            <form method="post" action="" id="sendForm" enctype="application/x-www-form-urlencoded">
+                <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"
+                    placeholder="message subject">
+                <div class="field">
+                    <textarea name="message" class="textarea" placeholder="type your message..." id="draftText" required></textarea>
+                </div>
+                <input type="submit" value="Send" class="button is-primary successBtn">
+            </form>
+        </div>
+    </div>
     <div id="infoOverlay" class="overlay">
     </div>
 </body>
diff --git a/static-data/www/mail/mail.css b/static-data/www/mail/mail.css
index 45099b0b..f2212a04 100755
--- a/static-data/www/mail/mail.css
+++ b/static-data/www/mail/mail.css
@@ -58,4 +58,3 @@
 #settingsModal small{
     font-size: 0.5em;
 }
-
diff --git a/static-data/www/mail/mail.js b/static-data/www/mail/mail.js
index 12956d98..f83408d0 100755
--- a/static-data/www/mail/mail.js
+++ b/static-data/www/mail/mail.js
@@ -128,6 +128,7 @@ function openThread(bHash, sender, date, sigBool, pubkey, subjectLine){
         sigEl.innerText = sigMsg
         overlay('messageDisplay')
         replyBtn.onclick = function(){
+            document.getElementById('messageDisplay').style.visibility = 'hidden'
             openReply(bHash, messageDisplay.innerText, subjectLine)
         }
         addUnknownContact.onclick = function(){
@@ -144,6 +145,7 @@ function setActiveTab(tabName){
     threadPart.innerHTML = ""
     noInbox.style.display = 'none'
     window.inboxActive = false
+    document.getElementById('sendMessage').classList.add('is-hidden')
     switch(tabName){
         case 'inbox':
             window.inboxActive = true
@@ -154,8 +156,7 @@ function setActiveTab(tabName){
             getSentbox()
             break
         case 'compose':
-            overlay('sendMessage')
-            document.getElementById('inboxTab').click()
+            document.getElementById('sendMessage').classList.remove('is-hidden')
             break
         case 'settings':
             document.getElementById('settingsModal').classList.add('is-active')
@@ -419,7 +420,6 @@ fetch('/friends/list', {
 .then(function(resp) {
     var friendSelectParent = document.getElementById('friendSelect')
     var keys = [];
-    var friend
     for(var k in resp) keys.push(k);
 
     friendSelectParent.appendChild(document.createElement('option'))