postfix_scripts

@@ -67,12 +67,7 @@ search_user_from_mailid "$MAILID"

 [ $DEBUG -eq 1 ] && echo "User not found. Try to detect original mail ID with message ID in log"

-if [ $DEBUG -eq 1 ]

-then

-	MSGID=$( mailid_to_messageid "$MAILID" -d )

-else

 MSGID=$( mailid_to_messageid "$MAILID" )

-fi

 if [ -z "$MSGID" ]

 then

@@ -82,12 +77,7 @@ fi

 [ $DEBUG -eq 1 ] && echo "Message ID found : $MSGID. Try to detect original mail ID with this message ID"

-if [ $DEBUG -eq 1 ]

-then

-	ORIGMAILID=$( messageid_to_original_mailid "$MAILID" -d )

-else

-	ORIGMAILID=$( messageid_to_original_mailid "$MAILID" )

-fi

+ORIGMAILID=$( messageid_to_original_mailid "$MSGID" )

 if [ -z "$ORIGMAILID" ]

 then