From 0e1504416a386da8ef73c8d198f5127bcdb33112 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Fri, 5 Sep 2008 15:29:42 +0000
Subject: [PATCH] Monotone-Parent: 054094f9b080f4f9f4cda29e0be81cf14681bb8e
 Monotone-Revision: 2b06dc463d88e9e0940158ceccab067e7cc497f7

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2008-09-05T15:29:42
Monotone-Branch: ca.inverse.sogo
---
 ChangeLog                               |  2 ++
 SoObjects/Mailer/SOGoMailObject+Draft.m | 25 +++++++++++++++----------
 2 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8d667f4b0..507ebc6f6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,8 @@
 	* SoObjects/Mailer/SOGoMailObject+Draft.m ([SOGoMailObject
 	-contentForReply]): if the reply style is outlook, then we use the
 	content generated for inline forwarding.
+	([SOGoMailObject -useOutlookStyleReplies]): new method that
+	indicates whether the ud key "SOGoMailUseOutlookStyleReplies".
 
 	* SoObjects/Mailer/SOGoMailFolder.m ([SOGoMailFolder
 	-expungeLastMarkedFolder]): do not perform the expunge if the
diff --git a/SoObjects/Mailer/SOGoMailObject+Draft.m b/SoObjects/Mailer/SOGoMailObject+Draft.m
index 686721d74..0df47ec54 100644
--- a/SoObjects/Mailer/SOGoMailObject+Draft.m
+++ b/SoObjects/Mailer/SOGoMailObject+Draft.m
@@ -23,6 +23,7 @@
 #import <Foundation/NSArray.h>
 #import <Foundation/NSDictionary.h>
 #import <Foundation/NSEnumerator.h>
+#import <Foundation/NSUserDefaults.h>
 
 #import <NGObjWeb/WOApplication.h>
 #import <NGObjWeb/WOResponse.h>
@@ -40,16 +41,20 @@
 
 #define maxFilenameLength 64
 
-static BOOL useOutlookStyleReplies = NO;
-
 @implementation SOGoMailObject (SOGoDraftObjectExtensions)
 
-+ (void) initialize
+- (BOOL) useOutlookStyleReplies
 {
   NSUserDefaults *ud;
+  static int useOutlookStyleReplies = -1;
 
-  ud = [NSUserDefaults standardUserDefaults];
-  useOutlookStyleReplies = [ud boolForKey: @"SOGoMailUseOutlookStyleReplies"];
+  if (useOutlookStyleReplies == -1)
+    {
+      ud = [NSUserDefaults standardUserDefaults];
+      useOutlookStyleReplies = [ud boolForKey: @"SOGoMailUseOutlookStyleReplies"];
+    }
+
+  return (useOutlookStyleReplies);
 }
 
 - (NSString *) subjectForReply
@@ -142,11 +147,11 @@ static BOOL useOutlookStyleReplies = NO;
 - (NSString *) contentForReply
 {
   SOGoUser *currentUser;
-  NSString *pageName, *content;
+  NSString *pageName, *replyContent;
   SOGoMailReply *page;
 
-  if (useOutlookStyleReplies)
-    content = [self contentForInlineForward];
+  if ([self useOutlookStyleReplies])
+    replyContent = [self contentForInlineForward];
   else
     {
       currentUser = [context activeUser];
@@ -155,10 +160,10 @@ static BOOL useOutlookStyleReplies = NO;
       page = [[WOApplication application] pageWithName: pageName
 					  inContext: context];
       [page setRepliedMail: self];
-      content = [[page generateResponse] contentAsString];
+      replyContent = [[page generateResponse] contentAsString];
     }
 
-  return content;
+  return replyContent;
 }
 
 - (NSString *) filenameForForward