diff --git a/Modules.Messaging/Email2.vb b/Modules.Messaging/Email2.vb
index f3bc043d..46f2e21f 100644
--- a/Modules.Messaging/Email2.vb
+++ b/Modules.Messaging/Email2.vb
@@ -344,7 +344,8 @@ Public Class Email2
         Try
             Dim oTempPath As String = IO.Path.GetTempPath()
             Dim oFileNameWithoutExtension = Path.GetFileNameWithoutExtension(pMsgFile)
-            Dim oEmlPath As String = IO.Path.Combine(oTempPath, $"{oFileNameWithoutExtension}.eml")
+            Dim oFileNameWithoutInvalidChars = Language.Utils.RemoveInvalidCharacters(oFileNameWithoutExtension)
+            Dim oEmlPath As String = IO.Path.Combine(oTempPath, $"{oFileNameWithoutInvalidChars}.eml")
             Dim oVersionedPath As String = FileEx.GetVersionedFilename(oEmlPath)
 
             Using oConverter As New MsgConverter(pMsgFile)
diff --git a/Modules.Messaging/Messaging.vbproj b/Modules.Messaging/Messaging.vbproj
index a882a73b..b7c5547f 100644
--- a/Modules.Messaging/Messaging.vbproj
+++ b/Modules.Messaging/Messaging.vbproj
@@ -127,6 +127,10 @@
       <Project>{991d0231-4623-496d-8bd0-9ca906029cbc}</Project>
       <Name>Filesystem</Name>
     </ProjectReference>
+    <ProjectReference Include="..\Modules.Language\Language.vbproj">
+      <Project>{d3c8cfed-d6f6-43a8-9bdf-454145d0352f}</Project>
+      <Name>Language</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Modules.Logging\Logging.vbproj">
       <Project>{903b2d7d-3b80-4be9-8713-7447b704e1b0}</Project>
       <Name>Logging</Name>