diff --git a/ChangeLog b/ChangeLog
index e7a6eaeb1..0fe28a8a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,14 @@
 	* OpenChange/MAPIStoreRecurrenceUtils.m: new module implementing
 	methods useful for handling recurrences in events and tasks.
 
+2011-03-31  Francis Lachapelle  <flachapelle@inverse.ca>
+
+	* UI/WebServerResources/MailerUI.js (messageListCallback): put an
+	non-breaking space in empty cells, not only for IE.
+
+	* UI/Contacts/UIxContactView.m (_cardStringWithLabel:value:):
+	remove useless carriage returns to avoid JavaScript errors in IE7.
+
 2011-03-30  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* UI/MailerUI/UIxMailFolderActions.m (-copyMessagesAction)
diff --git a/UI/Contacts/UIxContactView.m b/UI/Contacts/UIxContactView.m
index a2191cf1b..ba7360a9d 100644
--- a/UI/Contacts/UIxContactView.m
+++ b/UI/Contacts/UIxContactView.m
@@ -1,6 +1,6 @@
 /*
   Copyright (C) 2004 SKYRIX Software AG
-  Copyright (C) 2005-2010 Inverse inc.
+  Copyright (C) 2005-2011 Inverse inc.
 
   This file is part of SOGo.
  
@@ -64,6 +64,7 @@
   NSMutableString *cardString;
 
   cardString = [NSMutableString stringWithCapacity: 80];
+  value = [value stringByReplacingString: @"\r" withString: @""];
   if ([value length] > 0)
     {
       if (label)
diff --git a/UI/WebServerResources/MailerUI.js b/UI/WebServerResources/MailerUI.js
index a1867c3cd..89a43d939 100644
--- a/UI/WebServerResources/MailerUI.js
+++ b/UI/WebServerResources/MailerUI.js
@@ -828,7 +828,7 @@ function messageListCallback(row, data, isNew) {
         var cellType = columnsOrder[j];
 
         if (data[cellType]) cell.innerHTML = data[cellType];
-        else if (Prototype.Browser.IE) cell.innerHTML = '&nbsp;';
+        else cell.innerHTML = '&nbsp;';
     }
 }