diff --git a/Global_Indexer/frmIndex.vb b/Global_Indexer/frmIndex.vb
index b0ff4ee..48638e3 100644
--- a/Global_Indexer/frmIndex.vb
+++ b/Global_Indexer/frmIndex.vb
@@ -933,7 +933,11 @@ Public Class frmIndex
 
                 ' This cannot use Path.Combine, otherwise the WINDREAM_BASEPATH will be swallowed... lol
                 'Dim oMsgFilePath As String = Path.Combine(WINDREAM_BASEPATH, CURRENT_NEWFILENAME)
-                Dim oMsgFilePath As String = WINDREAM_BASEPATH & CURRENT_NEWFILENAME
+
+                Dim oMsgFilePath As String = CURRENT_NEWFILENAME
+                If CURRENT_NEWFILENAME.StartsWith(WINDREAM_BASEPATH) = False Then
+                    oMsgFilePath = WINDREAM_BASEPATH & oMsgFilePath
+                End If
 
                 Dim oMail As IMail = EMAIL.Load_Email(oMsgFilePath)