diff --git a/SoObjects/SOGo/SOGoMailer.m b/SoObjects/SOGo/SOGoMailer.m
index ec7d2f061..bf482739e 100644
--- a/SoObjects/SOGo/SOGoMailer.m
+++ b/SoObjects/SOGo/SOGoMailer.m
@@ -368,7 +368,8 @@
 	      r1 = [cleaned_message rangeOfCString: "\r\nBcc: "
 					   options: 0
 					     range: NSMakeRange(0,limit)];
-	      r1.location += 2;
+	      if (r1.location != NSNotFound)
+		r1.location += 2;
 	    }
 
 	  if (r1.location != NSNotFound)