From d33f65fe0026f72b67db4dd34112121cb72464c3 Mon Sep 17 00:00:00 2001
From: Jeffrey Stedfast <jeff@xamarin.com>
Date: Thu, 18 Jun 2015 19:50:07 -0400
Subject: [PATCH] Changed BodyParts and Attachments to be
 IEnumerable<MimeEntity>

Fixes issue #148
---
 MimeKit/MimeMessage.cs | 28 ++++++++--------------------
 1 file changed, 8 insertions(+), 20 deletions(-)

diff --git a/MimeKit/MimeMessage.cs b/MimeKit/MimeMessage.cs
index a2dd679833..da0b22309b 100644
--- a/MimeKit/MimeMessage.cs
+++ b/MimeKit/MimeMessage.cs
@@ -865,7 +865,7 @@ public string GetTextBody (TextFormat format)
 			return null;
 		}
 
-		static IEnumerable<MimePart> EnumerateMimeParts (MimeEntity entity)
+		static IEnumerable<MimeEntity> EnumerateMimeParts (MimeEntity entity)
 		{
 			if (entity == null)
 				yield break;
@@ -881,30 +881,18 @@ static IEnumerable<MimePart> EnumerateMimeParts (MimeEntity entity)
 				yield break;
 			}
 
-			var msgpart = entity as MessagePart;
-
-			if (msgpart != null) {
-				var message = msgpart.Message;
-
-				if (message != null) {
-					foreach (var part in EnumerateMimeParts (message.Body))
-						yield return part;
-				}
-
-				yield break;
-			}
-
-			yield return (MimePart) entity;
+			yield return entity;
 		}
 
 		/// <summary>
 		/// Gets the body parts of the message.
 		/// </summary>
 		/// <remarks>
-		/// Traverses over the MIME tree, enumerating all of the <see cref="MimePart"/> objects.
+		/// Traverses over the MIME tree, enumerating all of the <see cref="MimeEntity"/> objects,
+		/// but does not traverse into the bodies of attached messages.
 		/// </remarks>
 		/// <value>The body parts.</value>
-		public IEnumerable<MimePart> BodyParts {
+		public IEnumerable<MimeEntity> BodyParts {
 			get { return EnumerateMimeParts (Body); }
 		}
 
@@ -912,12 +900,12 @@ public IEnumerable<MimePart> BodyParts {
 		/// Gets the attachments.
 		/// </summary>
 		/// <remarks>
-		/// Traverses over the MIME tree, enumerating all of the <see cref="MimePart"/> objects that
+		/// Traverses over the MIME tree, enumerating all of the <see cref="MimeEntity"/> objects that
 		/// have a Content-Disposition header set to <c>"attachment"</c>.
 		/// </remarks>
 		/// <value>The attachments.</value>
-		public IEnumerable<MimePart> Attachments {
-			get { return EnumerateMimeParts (Body).Where (part => part.IsAttachment); }
+		public IEnumerable<MimeEntity> Attachments {
+			get { return EnumerateMimeParts (Body).Where (x => x.IsAttachment); }
 		}
 
 		/// <summary>