diff --git a/OpenPop/Mime/MessagePart.cs b/OpenPop/Mime/MessagePart.cs
index 78c480f..52fe21a 100644
--- a/OpenPop/Mime/MessagePart.cs
+++ b/OpenPop/Mime/MessagePart.cs
@@ -486,7 +486,14 @@ private static byte[] DecodeBody(byte[] messageBody, ContentTransferEncoding con
 
 				case ContentTransferEncoding.Base64:
 					// If encoded in Base64, everything in the body is in US-ASCII
-					return Base64.Decode(Encoding.ASCII.GetString(messageBody));
+					try
+					{
+						return Base64.Decode(Encoding.ASCII.GetString(messageBody));
+					}
+					catch
+					{
+						return messageBody;
+					}
 
 				case ContentTransferEncoding.SevenBit:
 				case ContentTransferEncoding.Binary:
@@ -545,4 +552,4 @@ public void Save(Stream messageStream)
 		}
 		#endregion
 	}
-}
\ No newline at end of file
+}