From 71c61697abd5b645302ae38c78ed7e54cb3cbafc Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Thu, 16 Oct 2008 15:09:15 +0000
Subject: [PATCH] Monotone-Parent: 6e72cda98a0d10247d00cb8b21c0989d26a9e774
 Monotone-Revision: cb44eaef6cc3aa0a6f570b05e783dcb291f731f4

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2008-10-16T15:09:15
Monotone-Branch: ca.inverse.sogo
---
 UI/WebServerResources/MailerUI.js        | 14 +++++++++++---
 UI/WebServerResources/UIxPreferences.css |  6 +++---
 UI/WebServerResources/generic.js         | 11 ++++++-----
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/UI/WebServerResources/MailerUI.js b/UI/WebServerResources/MailerUI.js
index 334517d64..0cb8aee6d 100644
--- a/UI/WebServerResources/MailerUI.js
+++ b/UI/WebServerResources/MailerUI.js
@@ -848,20 +848,28 @@ function loadMessage(idx) {
   }
 
   var cachedMessage = getCachedMessage(idx);
-
-  markMailInWindow(window, idx, true);
+	var row = $("row_" + idx);
+	var seenStateChanged = row.hasClassName('mailer_unreadmail');
   if (cachedMessage == null) {
     var url = (ApplicationBaseURL + encodeURI(Mailer.currentMailbox) + "/"
 							 + idx + "/view?noframe=1");
     document.messageAjaxRequest
       = triggerAjaxRequest(url, messageCallback, idx);
-  } else {
+		markMailInWindow(window, idx, true);
+  }
+	else {
     var div = $('messageContent');
     div.update(cachedMessage['text']);
     cachedMessage['time'] = (new Date()).getTime();
     document.messageAjaxRequest = null;
     configureLinksInMessage();
     resizeMailContent();
+		if (seenStateChanged) {
+			// Mark message as read on server
+			var img = row.select("IMG.mailerUnreadIcon").first();
+			var fcnMarkRead = mailListMarkMessage.bind(img);
+			fcnMarkRead();
+		}
   }
 
 	configureLoadImagesButton();
diff --git a/UI/WebServerResources/UIxPreferences.css b/UI/WebServerResources/UIxPreferences.css
index c85ca1989..32bd3faa7 100644
--- a/UI/WebServerResources/UIxPreferences.css
+++ b/UI/WebServerResources/UIxPreferences.css
@@ -29,6 +29,6 @@ DIV#identitiesView
 
 #signature
 { overflow: auto;
-  width: 380px;
-  max-width: 380px;
-  height: 125px; }
+  width: 390px;
+  max-width: 390px;
+  height: 145px; }
diff --git a/UI/WebServerResources/generic.js b/UI/WebServerResources/generic.js
index d23621d19..d8b6e577e 100644
--- a/UI/WebServerResources/generic.js
+++ b/UI/WebServerResources/generic.js
@@ -446,10 +446,11 @@ function getTarget(event) {
 }
 
 function preventDefault(event) {
-  if (event.preventDefault)
-    event.preventDefault(); // W3C DOM
-  else
-    event.returnValue = false; // IE
+	if (event)
+		if (event.preventDefault)
+			event.preventDefault(); // W3C DOM
+		else
+			event.returnValue = false; // IE
 }
 
 function resetSelection(win) {
@@ -1462,7 +1463,7 @@ function onLinkBannerClick() {
 function onPreferencesClick(event) {
   var urlstr = UserFolderURL + "preferences";
   var w = window.open(urlstr, "_blank",
-											"width=430,height=250,resizable=0,scrollbars=0,location=0");
+											"width=440,height=250,resizable=0,scrollbars=0,location=0");
   w.opener = window;
   w.focus();