From d9ad28665095676f486f290936fced2e55e5d2e0 Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Fri, 23 May 2014 11:23:02 -0400
Subject: [PATCH] Fix newline in signature of attachment

Fixes #2787
---
 NEWS                         |  1 +
 UI/MailerUI/UIxMailActions.m | 10 +++++++++-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/NEWS b/NEWS
index 601170642..fffbff36c 100644
--- a/NEWS
+++ b/NEWS
@@ -36,6 +36,7 @@ Bug fixes
  - fixed focus of popup windows open through a contextual menu with Firefox on Windows 7
  - fixed missing characters in shared folder names over ActiveSync (#2709)
  - fixed reply and forward mail templates for Brazilian Portuguese (#2738)
+ - fixed newline in signature when forwarding a message as attachment in HTML mode (#2787)
 
 2.2.3 (2014-04-03)
 ------------------
diff --git a/UI/MailerUI/UIxMailActions.m b/UI/MailerUI/UIxMailActions.m
index c32a4f80c..b21cd160f 100644
--- a/UI/MailerUI/UIxMailActions.m
+++ b/UI/MailerUI/UIxMailActions.m
@@ -23,6 +23,7 @@
 #import <Foundation/NSString.h>
 
 #import <NGObjWeb/WOContext.h>
+#import <NGObjWeb/WOContext+SoObjects.h>
 #import <NGObjWeb/WORequest.h>
 #import <NGObjWeb/WOResponse.h>
 #import <NGObjWeb/NSException+HTTP.h>
@@ -31,9 +32,10 @@
 #import <SoObjects/Mailer/SOGoDraftsFolder.h>
 #import <SoObjects/Mailer/SOGoMailAccount.h>
 #import <SoObjects/Mailer/SOGoMailObject.h>
+#import <SoObjects/SOGo/NSString+Utilities.h>
+#import <SoObjects/SOGo/SOGoUser.h>
 #import <SoObjects/SOGo/SOGoUserDefaults.h>
 
-
 #import "../Common/WODirectAction+SOGo.h"
 
 #import "UIxMailActions.h"
@@ -76,12 +78,18 @@
   SOGoMailObject *co;
   SOGoDraftsFolder *folder;
   SOGoDraftObject *newMail;
+  SOGoUserDefaults *ud;
   NSString *newLocation;
+  BOOL htmlComposition;
 
   co = [self clientObject];
   account = [co mailAccountFolder];
   folder = [account draftsFolderInContext: context];
   newMail = [folder newDraft];
+  ud = [[context activeUser] userDefaults];
+  htmlComposition = [[ud mailComposeMessageType] isEqualToString: @"html"];
+
+  [newMail setIsHTML: htmlComposition];
   [newMail fetchMailForForwarding: co];
 
   newLocation = [NSString stringWithFormat: @"%@/edit",