diff --git a/NEWS b/NEWS
index 4b88640e7..9271e0c1a 100644
--- a/NEWS
+++ b/NEWS
@@ -14,6 +14,7 @@ Bug fixes
  - make sure English is always used when generating Date headers using EAS (#3356)
  - don't escape quoted strings during versit generation
  - we now return all cards when we receive an empty addressbook-query REPORT
+ - avoid crash when replying to a mail with no recipients (#3359)
 
 2.3.2 (2015-09-16)
 ------------------
diff --git a/SoObjects/Mailer/SOGoDraftObject.m b/SoObjects/Mailer/SOGoDraftObject.m
index a3a06e557..471914ab6 100644
--- a/SoObjects/Mailer/SOGoDraftObject.m
+++ b/SoObjects/Mailer/SOGoDraftObject.m
@@ -700,7 +700,8 @@ static NSString    *userAgent      = nil;
     for (count = max - 1; count >= 0; count--)
       {
 	currentAddress = [addresses objectAtIndex: count];
-	if ([currentRecipient
+	if (![currentAddress baseEMail] ||
+            [currentRecipient
               caseInsensitiveCompare: [currentAddress baseEMail]]
             == NSOrderedSame)
 	  {