Monotone-Parent: 2b06dc463d88e9e0940158ceccab067e7cc497f7

Monotone-Revision: 81f6f619789306a73dc061a36ac5b92bc8ecaac6

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2008-09-05T15:55:03
Monotone-Branch: ca.inverse.sogo

SoObjects/Mailer/SOGoMailObject+Draft.m

@@ -88,7 +88,6 @@
   return newSubject;
 }
 
-
 - (NSString *) _contentForEditingFromKeys: (NSArray *) keys
 {
   NSArray *types;
@@ -126,7 +125,7 @@
 	    }
 	}
     }
-  
+
   return content;
 }
 
@@ -151,7 +150,7 @@
   SOGoMailReply *page;
 
   if ([self useOutlookStyleReplies])
-    replyContent = [self contentForInlineForward];
+    replyContent = [self contentForOutlookReply];
   else
     {
       currentUser = [context activeUser];
@@ -166,6 +165,23 @@
   return replyContent;
 }
 
+- (NSString *) contentForOutlookReply
+{
+  SOGoUser *currentUser;
+  NSString *pageName;
+  SOGoMailForward *page;
+
+  currentUser = [context activeUser];
+  pageName = [NSString stringWithFormat: @"SOGoMail%@Forward",
+		       [currentUser language]];
+  page = [[WOApplication application] pageWithName: pageName
+				      inContext: context];
+  [page setForwardedMail: self];
+  [page setReplyMode: YES];
+
+  return [[page generateResponse] contentAsString];
+}
+
 - (NSString *) filenameForForward
 {
   NSString *subject;
@@ -224,6 +240,7 @@
   page = [[WOApplication application] pageWithName: pageName
 				      inContext: context];
   [page setForwardedMail: self];
+  [page setReplyMode: NO];
 
   return [[page generateResponse] contentAsString];
 }