diff --git a/ChangeLog b/ChangeLog
index e3239c946..26c607f15 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,8 @@
 
 	* Tools/gdomap.c: Added some checks that getting/setting uid/gid
 	worked as expected and moved getpwnam() call to where it works.
+	* Source/Additions/GSMime.m: ([GSMimeDocument-rawMimeData:]) bugfix
+	to remove mjime version header from inner documents.
 
 2003-10-07  Richard Frith-Macdonald <rfm@gnu.org>
 
diff --git a/Source/Additions/GSMime.m b/Source/Additions/GSMime.m
index e824d7e72..a0831cfdf 100644
--- a/Source/Additions/GSMime.m
+++ b/Source/Additions/GSMime.m
@@ -3875,6 +3875,17 @@ static NSCharacterSet	*tokenSet = nil;
 	  RELEASE(hdr);
 	}
     }
+  else
+    {
+      /*
+       * Inner documents should not contain the mime version header.
+       */
+      hdr = [self headerNamed: @"mime-version"];
+      if (hdr != nil)
+	{
+	  [self deleteHeader: hdr];
+	}
+    }
 
   if ([content isKindOfClass: [NSArray class]] == YES)
     {