Monotone-Parent: 025330d36e1af8f073a0b0a02b64a65e36da2ffb

Monotone-Revision: 62c54dca797fd3a058e6792e05ab111266735658

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-11-05T16:37:17
Monotone-Branch: ca.inverse.sogo

UI/MailerUI/UIxMailListView.m

@@ -100,18 +100,13 @@
 
 - (NSString *) messageSubject
 {
+  id baseSubject;
   NSString *subject;
-  id envSubject;
 
-  envSubject = [[message valueForKey: @"envelope"] subject];
-  if ([envSubject isKindOfClass: [NSData class]])
-    {
-      subject = [[NSString alloc] initWithData: envSubject
-				  encoding: NSUTF8StringEncoding];
-      [subject autorelease];
-    }
-  else
-    subject = envSubject;
+  baseSubject = [[message valueForKey: @"envelope"] subject];
+  subject = [baseSubject decodedSubject];
+  if (![subject length])
+    subject = [self labelForKey: @"Untitled"];
 
   return subject;
 }