diff --git a/rfc2045.c b/rfc2045.c
index 14e222a..9ee4e85 100644
--- a/rfc2045.c
+++ b/rfc2045.c
@@ -162,6 +162,11 @@ blaze822_multipart(struct message *msg, struct message **imsg)
 	if (!nextpart)
 		return 0;   // XXX error condition
 
+	if (*(nextpart-1) == '\n')
+		nextpart--;
+	if (*(nextpart-1) == '\r')
+		nextpart--;
+
 	*imsg = blaze822_mem(part, nextpart-part);
 
 	return 1;