diff --git a/Source/Additions/GSMime.m b/Source/Additions/GSMime.m
index 35dc30df5..9016f6497 100644
--- a/Source/Additions/GSMime.m
+++ b/Source/Additions/GSMime.m
@@ -3948,6 +3948,13 @@ static NSCharacterSet	*tokenSet = nil;
 	  if (v == nil)
 	    {
 	      start = [content objectAtIndex: 0];
+	      v = [start contentID];
+	      if (v == nil)
+		{
+		  hdr = [start makeContentID];
+		  v = [hdr value];
+		}
+	      [type setParameter: v forKey: @"start"];
 	    }
 	  else
 	    {