diff --git a/ChangeLog b/ChangeLog
index d632805b6..9ec3df5e6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2007-11-05  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
+	* UI/MailerUI/UIxMailListView.m ([UIxMailListView
+	-showToAddress]): the answer is cached.
+
 	* UI/Common/UIxObjectActions.m ([UIxObjectActions +initialize]):
 	read "SOGoACLsSendEMailNotifications" from the user defaults to
 	determiner whether to send an email when a user is added or
diff --git a/UI/MailerUI/UIxMailListView.h b/UI/MailerUI/UIxMailListView.h
index 8ab751e3e..8da0e5aaf 100644
--- a/UI/MailerUI/UIxMailListView.h
+++ b/UI/MailerUI/UIxMailListView.h
@@ -36,6 +36,7 @@
   EOQualifier *qualifier;
   SOGoDateFormatter *dateFormatter;
   NSTimeZone *userTimeZone;
+  int folderType;
 }
 
 - (NSString *) defaultSortKey;
diff --git a/UI/MailerUI/UIxMailListView.m b/UI/MailerUI/UIxMailListView.m
index 951560ae1..ed4d74f41 100644
--- a/UI/MailerUI/UIxMailListView.m
+++ b/UI/MailerUI/UIxMailListView.m
@@ -38,8 +38,10 @@
 
 #import <EOControl/EOQualifier.h>
 
+#import <SoObjects/Mailer/SOGoDraftsFolder.h>
 #import <SoObjects/Mailer/SOGoMailFolder.h>
 #import <SoObjects/Mailer/SOGoMailObject.h>
+#import <SoObjects/Mailer/SOGoSentFolder.h>
 #import <SoObjects/SOGo/NSArray+Utilities.h>
 #import <SoObjects/SOGo/SOGoDateFormatter.h>
 #import <SoObjects/SOGo/SOGoUser.h>
@@ -60,6 +62,7 @@
       user = [context activeUser];
       ASSIGN (dateFormatter, [user dateFormatterInContext: context]);
       ASSIGN (userTimeZone, [user timeZone]);
+      folderType = 0;
     }
 
   return self;
@@ -113,10 +116,19 @@
 
 - (BOOL) showToAddress 
 {
-  NSString *ftype;
-  
-  ftype = [[self clientObject] valueForKey:@"outlookFolderClass"];
-  return [ftype isEqual:@"IPF.Sent"];
+  SOGoMailFolder *co;
+
+  if (!folderType)
+    {
+      co = [self clientObject];
+      if ([co isKindOfClass: [SOGoSentFolder class]]
+	  || [co isKindOfClass: [SOGoDraftsFolder class]])
+	folderType = 1;
+      else
+	folderType = -1;
+    }
+
+  return (folderType == 1);
 }
 
 /* title */