diff --git a/App/DigitalData.EMLProfiler/clsWorkEmail.vb b/App/DigitalData.EMLProfiler/clsWorkEmail.vb
index 529494c..54b500a 100644
--- a/App/DigitalData.EMLProfiler/clsWorkEmail.vb
+++ b/App/DigitalData.EMLProfiler/clsWorkEmail.vb
@@ -4,6 +4,7 @@ Imports DigitalData.EMLProfiler.ClassCurrent
 Imports System.IO
 Imports DigitalData.Modules.Logging
 Imports DigitalData.Modules.Database
+Imports DigitalData.Modules.Language
 Imports System.Threading
 Imports Limilabs.Mail
 Imports Limilabs.Mail.MIME
@@ -336,7 +337,7 @@ Public Class clsWorkEmail
 
             ' Subject can be FILENAME_MAX_LENGTH chars at most, 
             ' otherwise we run into errors with the path being too long
-            Dim oSubjectFilename = CURRENT_MAIL_MESSAGE.Subject.Substring(0, FILENAME_MAX_LENGTH) & ".eml"
+            Dim oSubjectFilename = CURRENT_MAIL_MESSAGE.Subject.Truncate(FILENAME_MAX_LENGTH) & ".eml"
 
             Logger.Debug($"oSubjectFilename (beforeclean) is: {oSubjectFilename}")
             oSubjectFilename = RemoveIllegalFileNameChars(oSubjectFilename)
@@ -399,7 +400,7 @@ Public Class clsWorkEmail
 
                         'oTempFilename &= "\" & CURRENT_MAIL_MESSAGE_ID & ".eml"
                     Else
-                        Dim oFileName = CURRENT_MAIL_MESSAGE.Subject.Replace(" ", "") & ".eml"
+                        Dim oFileName = CURRENT_MAIL_MESSAGE.Subject.Truncate(FILENAME_MAX_LENGTH).Replace(" ", "") & ".eml"
                         oTempFilename = Path.Combine(oTempFilename, oFileName)
 
                         'oTempFilename &= "\" & CURRENT_MAIL_MESSAGE.Subject.Replace(" ", "") & ".eml"