From 287c57c99493d0b396f25e2152bdc620f5a5adbe Mon Sep 17 00:00:00 2001
From: Francis Lachapelle <flachapelle@inverse.ca>
Date: Fri, 12 Aug 2016 11:38:05 -0400
Subject: [PATCH] Restore SOGoMailAddOutgoingAddresses functionality

---
 NEWS                               | 12 ++++++++++++
 SoObjects/Mailer/SOGoDraftObject.h |  2 +-
 SoObjects/Mailer/SOGoDraftObject.m |  5 ++---
 UI/MailerUI/UIxMailEditor.m        |  2 +-
 4 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/NEWS b/NEWS
index d738f286d..a6c76bb5c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,15 @@
+3.1.6 (2016-MM-DD)
+------------------
+
+New features
+ - 
+
+Enhancements
+ - 
+
+Bug fixes
+ - [web] restored functionality to save unknown recipient emails to address book on send
+
 3.1.5 (2016-08-10)
 ------------------
 
diff --git a/SoObjects/Mailer/SOGoDraftObject.h b/SoObjects/Mailer/SOGoDraftObject.h
index 0b1eeb93f..cf4e06d27 100644
--- a/SoObjects/Mailer/SOGoDraftObject.h
+++ b/SoObjects/Mailer/SOGoDraftObject.h
@@ -114,7 +114,7 @@
 - (NSArray *) allBareRecipients;
 
 - (NSException *) delete;
-/* - (NSException *) sendMail; */
+- (NSException *) sendMail;
 - (NSException *) sendMailAndCopyToSent: (BOOL) copyToSent; /* default: YES */
 - (NSException *) save;
 
diff --git a/SoObjects/Mailer/SOGoDraftObject.m b/SoObjects/Mailer/SOGoDraftObject.m
index caf0f6363..c31239379 100644
--- a/SoObjects/Mailer/SOGoDraftObject.m
+++ b/SoObjects/Mailer/SOGoDraftObject.m
@@ -58,6 +58,7 @@
 
 #import <NGCards/NGVCard.h>
 
+#import <Contacts/SOGoContactFolder.h>
 #import <Contacts/SOGoContactFolders.h>
 #import <Contacts/SOGoContactGCSEntry.h>
 
@@ -1823,7 +1824,6 @@ static NSString    *userAgent      = nil;
 //
 //
 //
-/*
 - (NSException *) sendMail
 {
   SOGoUserDefaults *ud;
@@ -1838,7 +1838,7 @@ static NSString    *userAgent      = nil;
       SOGoContactGCSEntry *newContact;
       NGMailAddress *parsedRecipient;
       NGMailAddressParser *parser;
-      SOGoContactFolder *folder;
+      SOGoFolder <SOGoContactFolder> *folder;
       NGVCard *card;
  
       int i;
@@ -1885,7 +1885,6 @@ static NSString    *userAgent      = nil;
     }
   return [self sendMailAndCopyToSent: YES];
 }
-*/
 
 //
 //
diff --git a/UI/MailerUI/UIxMailEditor.m b/UI/MailerUI/UIxMailEditor.m
index 7ef694b10..767351b0b 100644
--- a/UI/MailerUI/UIxMailEditor.m
+++ b/UI/MailerUI/UIxMailEditor.m
@@ -864,7 +864,7 @@ static NSArray *infoKeys = nil;
     {
       error = [self validateForSend];
       if (!error)
-        error = [co sendMailAndCopyToSent: YES];
+        error = [co sendMail];
       else
 	error = [self failedToSaveFormResponse: [error reason]];
     }