diff --git a/ChangeLog b/ChangeLog
index f37d31389..70b62e55a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-06  Ludovic Marcotte  <lmarcotte@inverse.ca>
+
+	* SoObjects/Mailer/NSData+Mail.m (bodyDataFromEncoding:)
+	Consider "binary" just like 7 or 8bit.
+
 2011-07-06  Francis Lachapelle  <flachapelle@inverse.ca>
 
 	* UI/WebServerResources/SchedulerUI.js (onShowCompletedTasks)
diff --git a/SoObjects/Mailer/NSData+Mail.m b/SoObjects/Mailer/NSData+Mail.m
index 57e99e5cd..d54f28b3a 100644
--- a/SoObjects/Mailer/NSData+Mail.m
+++ b/SoObjects/Mailer/NSData+Mail.m
@@ -42,7 +42,8 @@
       realEncoding = [encoding lowercaseString];
 
       if ([realEncoding isEqualToString: @"7bit"]
-          || [realEncoding isEqualToString: @"8bit"])
+          || [realEncoding isEqualToString: @"8bit"]
+	  || [realEncoding isEqualToString: @"binary"])
         decodedData = self;
       else if ([realEncoding isEqualToString: @"base64"])
         decodedData = [self dataByDecodingBase64];