diff --git a/Modules.Messaging/Email2.vb b/Modules.Messaging/Email2.vb
index 5d88ead1..4dd5f177 100644
--- a/Modules.Messaging/Email2.vb
+++ b/Modules.Messaging/Email2.vb
@@ -290,12 +290,18 @@ Public Class Email2
     ''' <returns>The path of the new EML without attachments.</returns>
     Public Function Remove_AttachmentsFromEmail(pFileName As String, Optional pSuffix As String = "") As String
         Try
-            Dim oTempPath As String = Path.Combine(Path.GetTempPath(), Add_FilenameSuffix(pFileName, pSuffix, ".eml"))
+            ' Convert possible msg file to eml
+            Dim oEmlPath As String = MaybeConvert_MsgToEml(pFileName)
+
+            ' Clean and version new path
+            Dim oTempPath As String = Path.Combine(Path.GetTempPath(), Add_FilenameSuffix(oEmlPath, pSuffix, ".eml"))
             Dim oCleanedPath As String = FileEx.GetCleanPath(oTempPath)
             Dim oVersionedPath As String = FileEx.GetVersionedFilename(oCleanedPath)
-            Dim oEmlPath As String = MaybeConvert_MsgToEml(pFileName)
+
+            ' Load eml file
             Dim oMail = MailBuilder.CreateFromEmlFile(oEmlPath)
 
+            ' Remove attachments and save
             oMail.RemoveAttachments()
             oMail.Save(oVersionedPath)