diff --git a/UI/Templates/MailerUI/UIxMailView.wox b/UI/Templates/MailerUI/UIxMailView.wox
index 005df4d43..a0f3945ba 100644
--- a/UI/Templates/MailerUI/UIxMailView.wox
+++ b/UI/Templates/MailerUI/UIxMailView.wox
@@ -16,7 +16,7 @@
     <table class="mailer_fieldtable">
       <tr class="mailer_fieldrow">
         <td class="mailer_fieldname" ><var:string label:value="Subject"/>:</td>
-        <td class="mailer_subjectfieldvalue"><var:string value="messageSubject"/></td>
+        <td class="mailer_subjectfieldvalue" id="subject"><var:string value="messageSubject"/></td>
       </tr>
       <tr class="mailer_fieldrow">
         <td class="mailer_fieldname" ><var:string label:value="From"/>:</td>
diff --git a/UI/WebServerResources/UIxMailEditor.js b/UI/WebServerResources/UIxMailEditor.js
index 6c0a4610a..12b6ed0e9 100644
--- a/UI/WebServerResources/UIxMailEditor.js
+++ b/UI/WebServerResources/UIxMailEditor.js
@@ -423,6 +423,12 @@ function initMailEditor() {
 
     configureDragHandle();
 
+    // Set current subject as window title if not set, use '(Untitled)'
+    if (document.pageform.subject.value == "")
+        document.title = '(' + _("Untitled") + ')';
+    else
+        document.title = _(document.pageform.subject.value);
+
     // Change the window title when typing the subject
     $$("div#subjectRow input").first().on("keyup", updateWindowTitleFromSubject);
 
diff --git a/UI/WebServerResources/UIxMailPopupView.js b/UI/WebServerResources/UIxMailPopupView.js
index f1b370664..d92fc0bf3 100644
--- a/UI/WebServerResources/UIxMailPopupView.js
+++ b/UI/WebServerResources/UIxMailPopupView.js
@@ -16,6 +16,10 @@ function initPopupMailer(event) {
     window.messageUID = mailboxName + "/" + messageName;
 
     handleReturnReceipt();
+
+    var td = $("subject");
+    if (td)
+        document.title = td.allTextContent();
 }
 
 function onICalendarButtonClick(event) {