diff --git a/UI/Templates/MailerUI/UIxMailListView.wox b/UI/Templates/MailerUI/UIxMailListView.wox
index e57ac41ec..09dbd6b6f 100644
--- a/UI/Templates/MailerUI/UIxMailListView.wox
+++ b/UI/Templates/MailerUI/UIxMailListView.wox
@@ -35,16 +35,21 @@
 	    var:idx="prevFirstMessageNumber"
 	    ><var:string label:value="previous"/></a> |
 	</var:if>
-	<var:string value="firstMessageNumber" />
-	<var:string label:value="msgnumber_to" />
-	<var:string value="lastMessageNumber" />
-	<var:string label:value="msgnumber_of" />
-	<var:string value="sortedUIDs.count" />
-	<var:if condition="hasNext"
-	  >| <a href="#"
-	    var:idx="nextFirstMessageNumber"
-	    ><var:string label:value="next" /></a>
-	</var:if
+        <var:if condition="lastMessageNumber" const:negate="YES">
+          0 <var:string label:value="message"/>
+        </var:if>
+        <var:if condition="lastMessageNumber" const:negate="0">
+	  <var:string value="firstMessageNumber" />
+	  <var:string label:value="msgnumber_to" />
+	  <var:string value="lastMessageNumber" />
+	  <var:string label:value="msgnumber_of" />
+	  <var:string value="sortedUIDs.count" />
+	  <var:if condition="hasNext"
+	    >| <a href="#"
+	      var:idx="nextFirstMessageNumber"
+	      ><var:string label:value="next" /></a>
+	  </var:if>
+        </var:if
 	  ></td
 	></tr
       >
diff --git a/UI/WebServerResources/MailerUI.js b/UI/WebServerResources/MailerUI.js
index 11acd292c..665af3233 100644
--- a/UI/WebServerResources/MailerUI.js
+++ b/UI/WebServerResources/MailerUI.js
@@ -335,9 +335,13 @@ function onMailboxTreeItemClick(event) {
   if (currentMailboxType == "account" || currentMailboxType == "additional") {
     currentMailbox = mailbox;
     $("messageContent").update();
-    var body = $("messageList").tBodies[0];
+    var table = $("messageList");
+    var head = table.tHead;
+    var body = table.tBodies[0];
     for (var i = body.rows.length; i > 0; i--)
       body.deleteRow(i-1);
+    if (head.rows[1])
+      head.rows[1].firstChild.update();
   }
   else
     openMailbox(mailbox);
@@ -378,7 +382,7 @@ function composeNewMessage() {
 function openMailbox(mailbox, reload, idx) {
   if (mailbox != currentMailbox || reload) {
     currentMailbox = mailbox;
-    var url = ApplicationBaseURL + mailbox + "/view?noframe=1";
+    var url = ApplicationBaseURL + encodeURI(mailbox) + "/view?noframe=1";
     var messageContent = $("messageContent");
     messageContent.update();
     lastClickedRow = null; // from generic.js
@@ -485,8 +489,11 @@ function messageListCallback(http) {
       }
     }
   }
-  else
-    log("messageListCallback: problem during ajax request (readyState = " + http.readyState + ", status = " + http.status + ")");
+  else {
+    var data = http.responseText;
+    var msg = data.replace(/^(.*\n)*.*<p>((.*\n)*.*)<\/p>(.*\n)*.*$/, "$2");
+    log("messageListCallback: problem during ajax request (readyState = " + http.readyState + ", status = " + http.status + ", response = " + msg + ")");
+  }
 }
 
 function quotasCallback(http) {