diff --git a/Source/Additions/GSMime.m b/Source/Additions/GSMime.m
index f54884e83..eac78000f 100644
--- a/Source/Additions/GSMime.m
+++ b/Source/Additions/GSMime.m
@@ -6433,7 +6433,10 @@ appendString(NSMutableData *m, NSUInteger offset, NSUInteger fold,
 	      shouldSet = NO;
 	    }
 	}
-      else if (v == nil || [v isEqualToString: @"7bit"] == YES)
+      else if (v == nil
+        || [v isEqualToString: @"7bit"] == YES
+        || [v isEqualToString: @"quoted-printable"] == YES
+        || [v isEqualToString: @"x-uuencode"] == YES)
 	{
 	  /*
 	   * For 7bit encoding, we can accept the setting if the content