diff --git a/ChangeLog b/ChangeLog
index 7b1e6c3f8..a98d0f91e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2010-08-26  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/MailerUI/UIxMailEditor.m (_emailFromIdentity:): the "from"
+	field is handled in SOGoDraftObject, therefore we don't need to
+	modify it here, especially since this will alterate the display.
+
 	* Tests/Unit/TestNGMimeAddressHeaderFieldGenerator.m: new test
 	module for NGMimeAddressHeaderFieldGenerator.
 
diff --git a/UI/MailerUI/UIxMailEditor.m b/UI/MailerUI/UIxMailEditor.m
index 9dbe0104c..63ba01687 100644
--- a/UI/MailerUI/UIxMailEditor.m
+++ b/UI/MailerUI/UIxMailEditor.m
@@ -195,27 +195,11 @@ static NSArray *infoKeys = nil;
 
 - (NSString *) _emailFromIdentity: (NSDictionary *) identity
 {
-  static NSCharacterSet *specialCharacters = nil;
   NSString *fullName, *format;
 
-  if (!specialCharacters)
-    {
-      /* This list is taken from rfc 822 sect. 3.3. LEXICAL TOKENS: */
-      specialCharacters = [NSCharacterSet
-                            characterSetWithCharactersInString:
-                                                     @"()<>@,;:\\\".[]"];
-      [specialCharacters retain];
-    }
-
   fullName = [identity objectForKey: @"fullName"];
   if ([fullName length])
-    {
-      if ([fullName rangeOfCharacterFromSet: specialCharacters].location
-          == NSNotFound)
-        format = @"%{fullName} <%{email}>";
-      else
-        format = @"\"%{fullName}\" <%{email}>";
-    }
+    format = @"%{fullName} <%{email}>";
   else
     format = @"%{email}";