From a174278e04480acf3bda6c08686c0b339bf6bdb8 Mon Sep 17 00:00:00 2001
From: Wolfgang Sourdeau <wsourdeau@inverse.ca>
Date: Wed, 9 May 2007 19:16:17 +0000
Subject: [PATCH] Monotone-Parent: a4db2cbedfd0fe94155375b1cb396d2774cf14ff
 Monotone-Revision: 930c6f4859df86c03f367e50f6cd175b285fcfca

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2007-05-09T19:16:17
Monotone-Branch: ca.inverse.sogo
---
 SoObjects/Mailer/SOGoDraftObject.m | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/SoObjects/Mailer/SOGoDraftObject.m b/SoObjects/Mailer/SOGoDraftObject.m
index 8b9ad4c20..2e9137027 100644
--- a/SoObjects/Mailer/SOGoDraftObject.m
+++ b/SoObjects/Mailer/SOGoDraftObject.m
@@ -773,6 +773,25 @@ static NSString    *fromInternetSuffixPattern = nil;
   return ma;
 }
 
+- (NSString *) _rawSender
+{
+  NSString *startEmail, *rawSender;
+  NSRange delimiter;
+
+  startEmail = [self sender];
+  delimiter = [startEmail rangeOfString: @"<"];
+  if (delimiter.location == NSNotFound)
+    rawSender = startEmail;
+  else
+    {
+      rawSender = [startEmail substringFromIndex: NSMaxRange (delimiter)];
+      delimiter = [rawSender rangeOfString: @">"];
+      rawSender = [rawSender substringToIndex: delimiter.location];
+    }
+
+  return rawSender;
+}
+
 - (NSException *)sendMimeMessageAtPath:(NSString *)_path {
   static NGSendMail *mailer = nil;
   NSArray  *recipients;
@@ -781,7 +800,7 @@ static NSString    *fromInternetSuffixPattern = nil;
   /* validate */
   
   recipients = [self allRecipients];
-  from       = [self sender];
+  from       = [self _rawSender];
   if ([recipients count] == 0) {
     return [NSException exceptionWithHTTPStatus:500 /* server error */
 			reason:@"draft has no recipients set!"];