diff --git a/App/EmailProfiler.Common/clsWorkEmail.vb b/App/EmailProfiler.Common/clsWorkEmail.vb
index 08c6e64..48677f1 100644
--- a/App/EmailProfiler.Common/clsWorkEmail.vb
+++ b/App/EmailProfiler.Common/clsWorkEmail.vb
@@ -174,21 +174,28 @@ Public Class clsWorkEmail
                 Return PROCESS_MANAGER_IN(CurrentMail)
 
             Else
+
                 _Logger.Debug("CommonEmail-Process-Sniffer")
-                If COMMON_EMAIL_IN(CurrentMail) = True Then
-                    InsertHistoryEntry(CurrentMail)
-                    If CURRENT_ATTMT_COUNT = 0 Then
-                        _Logger.Info("### Mail contained no Attachments!! ###")
-                        Dim oBody = EmailStrings.EMAIL_NO_FERDS
-                        If AddToEmailQueueMSSQL(CurrentMail.MessageId, oBody, "No Attachments", _EmailAccountID) = True Then
-                            CURRENT_ImapObject.DeleteMessageByUID(poUID)
-                        End If
-                    End If
-                    Return True
-                Else
+
+                Dim oCommonEmailResult = COMMON_EMAIL_IN(CurrentMail)
+
+                If oCommonEmailResult = False Then
                     Return False
                 End If
 
+                If CURRENT_ATTMT_COUNT = 0 Then
+                    _Logger.Info("### Mail contained no Attachments!! ###")
+                    Dim oBody = EmailStrings.EMAIL_NO_FERDS
+                    If AddToEmailQueueMSSQL(CurrentMail.MessageId, oBody, "No Attachments", _EmailAccountID) = True Then
+                        CURRENT_ImapObject.DeleteMessageByUID(poUID)
+                    End If
+                    InsertHistoryEntryWithStatus(CurrentMail, "REJECTED", "No Attachments")
+                Else
+                    InsertHistoryEntry(CurrentMail)
+                End If
+
+                Return True
+
             End If
 
         Catch ex As Exception