diff --git a/Global_Indexer/frmIndex.vb b/Global_Indexer/frmIndex.vb
index e0c0853..02dce84 100644
--- a/Global_Indexer/frmIndex.vb
+++ b/Global_Indexer/frmIndex.vb
@@ -896,15 +896,19 @@ Public Class frmIndex
             ' If file is an email files (eml,msg) parse it to extract email data and save for later
             ' If file is an attachment, rely on the previously extracted value
 
+
+
             If pIndexAttachment = False Then
+                LOGGER.Debug("Indexing Email File: [{0}]", CURRENT_NEWFILENAME)
+
                 Dim oMsgFilePath As String = Path.Combine(WINDREAM_BASEPATH, CURRENT_NEWFILENAME)
                 Dim oMail As IMail = EMAIL.Load_Email(oMsgFilePath)
 
                 Dim oMessageId As String = oMail.MessageID
                 Dim oMessageFrom As String = EMAIL.Get_MessageSender(oMail)
                 Dim oMessageTo As String = EMAIL.Get_MessageReceiver(oMail)
+                Dim oDateIn As Date = EMAIL.Get_MessageDate(oMail)
                 Dim oSubject As String = oMail.Subject
-                Dim oDateIn As Date = oMail.Date
 
                 CURRENT_MESSAGEID = oMessageId
                 CURRENT_MESSAGEDATE = oDateIn