diff --git a/UI/MailerUI/French.lproj/Localizable.strings b/UI/MailerUI/French.lproj/Localizable.strings
index e5c8f1b1a..cebecbec5 100644
--- a/UI/MailerUI/French.lproj/Localizable.strings
+++ b/UI/MailerUI/French.lproj/Localizable.strings
@@ -70,8 +70,8 @@
 "previous"      = "précédent";
 "next"          = "suivant";
 
-"Mark Unread" = "Marqué comme non lu"; 
-"Mark Read"   = "Marqué comme lu";
+"Mark Unread" = "Marquer comme non lu"; 
+"Mark Read"   = "Marquer comme lu";
 
 "msgnumber_to"  = "à";
 "msgnumber_of"  = "de";
diff --git a/UI/Templates/MailerUI/UIxMailListView.wox b/UI/Templates/MailerUI/UIxMailListView.wox
index 1f85c528c..729927045 100644
--- a/UI/Templates/MailerUI/UIxMailListView.wox
+++ b/UI/Templates/MailerUI/UIxMailListView.wox
@@ -10,7 +10,6 @@
     title="name"
     >
     <var:component className="UIxMailFilterPanel" qualifier="qualifier" />
-    <var:string value="patate" />
 
     <table multiselect="yes" id="messageList"
       onselectionchange="onMessageSelectionChange();">
@@ -127,6 +126,8 @@
                   class="mailerReadIcon"
                   var:onclick="markUnreadJS"
                   label:title="Mark Unread"
+                  label:title-markread="Mark Read"
+                  label:title-markunread="Mark Unread"
                   var:id="msgIconReadImgID"
                   /></var:if
                 ><var:if condition="isMessageRead" const:negate="YES"
@@ -134,6 +135,8 @@
                   class="mailerUnreadIcon"
                   var:onclick="markReadJS"
                   label:title="Mark Read"
+                  label:title-markread="Mark Read"
+                  label:title-markunread="Mark Unread"
                   var:id="msgIconUnreadImgID"
                   /></var:if
                 ></td
diff --git a/UI/WebServerResources/MailerUI.js b/UI/WebServerResources/MailerUI.js
index eb02886c2..663d9a401 100644
--- a/UI/WebServerResources/MailerUI.js
+++ b/UI/WebServerResources/MailerUI.js
@@ -262,20 +262,40 @@ function markMailInWindow(win, msguid, markread) {
   msgDiv = win.document.getElementById("div_" + msguid);
   if (msgDiv) {
     if (markread) {
-      msgDiv.className = "mailer_readmailsubject";
-    
+      removeClassName(msgDiv, 'mailer_unreadmailsubject');
+      addClassName(msgDiv, 'mailer_readmailsubject');
       msgDiv = win.document.getElementById("unreaddiv_" + msguid);
-      if (msgDiv) msgDiv.style.display = "none";
-      msgDiv = win.document.getElementById("readdiv_" + msguid);
-      if (msgDiv) msgDiv.style.display = "block";
+      if (msgDiv)
+        {
+          msgDiv.setAttribute("class", "mailerUnreadIcon");
+          msgDiv.setAttribute("id", "readdiv_" + msguid);
+          msgDiv.setAttribute("src", ResourcesURL + "/icon_read.gif");
+          msgDiv.setAttribute("onclick", "mailListMarkMessage(this,"
+                              + " 'markMessageUnread', " + msguid
+                              + ", false);"
+                              +" return false;");
+          var title = msgDiv.getAttribute("title-markunread");
+          if (title)
+            msgDiv.setAttribute("title", title);
+        }
     }
     else {
-      msgDiv.className = "mailer_unreadmailsubject";
-    
+      removeClassName(msgDiv, 'mailer_readmailsubject');
+      addClassName(msgDiv, 'mailer_unreadmailsubject');
       msgDiv = win.document.getElementById("readdiv_" + msguid);
-      if (msgDiv) msgDiv.style.display = "none";
-      msgDiv = win.document.getElementById("unreaddiv_" + msguid);
-      if (msgDiv) msgDiv.style.display = "block";
+      if (msgDiv)
+        {
+          msgDiv.setAttribute("class", "mailerReadIcon");
+          msgDiv.setAttribute("id", "unreaddiv_" + msguid);
+          msgDiv.setAttribute("src", ResourcesURL + "/icon_unread.gif");
+          msgDiv.setAttribute("onclick", "mailListMarkMessage(this,"
+                              + " 'markMessageRead', " + msguid
+                              + ", true);"
+                              +" return false;");
+          var title = msgDiv.getAttribute("title-markread");
+          if (title)
+            msgDiv.setAttribute("title", title);
+        }
     }
     return true;
   }
@@ -326,7 +346,7 @@ function mailListMarkMessage(sender, action, msguid, markread)
   var url;
   var http = createHTTPClient();
 
-  url = action + "?uid=" + msguid;
+  url = ApplicationBaseURL + currentMailbox + "/" + action + "?uid=" + msguid;
 
   if (http) {
     // TODO: add parameter to signal that we are only interested in OK