diff --git a/App/DigitalData.EMLProfiler/clsWorkEmail.vb b/App/DigitalData.EMLProfiler/clsWorkEmail.vb
index 82c29b8..3286e05 100644
--- a/App/DigitalData.EMLProfiler/clsWorkEmail.vb
+++ b/App/DigitalData.EMLProfiler/clsWorkEmail.vb
@@ -14,6 +14,7 @@ Imports MailBox = Limilabs.Mail.Headers.MailBox
 
 Public Class clsWorkEmail
     Private Const FILENAME_MAX_LENGTH = 100
+    Private Const MESSAGE_ID_MAX_LENGTH = 100
 
     Private Shared Logger As Logger
     Private MyLogger As LogConfig
@@ -73,6 +74,11 @@ Public Class clsWorkEmail
             Else
                 If CURRENT_MAIL_MESSAGE_ID.Length = 0 Then
                     CURRENT_MAIL_MESSAGE_ID = System.Guid.NewGuid.ToString()
+                ElseIf CURRENT_MAIL_MESSAGE_ID.Length > MESSAGE_ID_MAX_LENGTH Then
+                    ' MessageIds longer than 100 chars will be replaced with a guid to avoid errors
+                    ' because of file paths longer than 255 chars.
+                    CURRENT_MAIL_MESSAGE_ID = System.Guid.NewGuid.ToString()
+
                 End If
             End If
             CURRENT_MAIL_MESSAGE_ID = CURRENT_MAIL_MESSAGE_ID.Replace(">", "").Replace("<", "")