diff --git a/App/EmailProfiler.Common/clsWorkEmail.vb b/App/EmailProfiler.Common/clsWorkEmail.vb
index 355a6a8..ea46e03 100644
--- a/App/EmailProfiler.Common/clsWorkEmail.vb
+++ b/App/EmailProfiler.Common/clsWorkEmail.vb
@@ -101,7 +101,7 @@ Public Class clsWorkEmail
             'TODO: Move all of these CURRENT_MAIL vars into a business object of type mail container
             _CurrentMail = New MailContainer(pMailMessage, poUID)
 
-            _Logger.Info($"Working on email from: {_CurrentMail.SenderAddress} - Subject: {_CurrentMail.Subject} - MessageID: {_CurrentMail.MessageId}")
+            _Logger.Info($"Working on email from: {_CurrentMail.SenderAddress} - Subject: {_CurrentMail.SubjectOriginal} - MessageID: {_CurrentMail.MessageId}")
             CURRENT_MAIL_BODY_ALL = String.Empty
             CURRENT_MAIL_BODY_ANSWER1 = String.Empty
             CURRENT_MAIL_BODY_Substr2 = String.Empty
@@ -134,11 +134,11 @@ Public Class clsWorkEmail
             '
             'End If
 
-            If IsNothing(_CurrentMail.Subject) Then
+            If IsNothing(_CurrentMail.SubjectOriginal) Then
                 CURRENT_MAIL_SUBJECT = String.Empty
                 _Logger.Warn("Subject was nothing!")
             Else
-                CURRENT_MAIL_SUBJECT = _CurrentMail.Subject.ToUpper.EscapeForSQL()
+                CURRENT_MAIL_SUBJECT = _CurrentMail.SubjectOriginal.ToUpper.EscapeForSQL()
                 _Logger.Debug("Fixed Subject: [{0}]", CURRENT_MAIL_SUBJECT)
             End If