Code cleanup.
Revert "Code cleanup."

This reverts commit 12906f0922c609cff3e5f397f5d19497e134f743.
Tidied.
Fixed: mails with an empty return-path header must not trigger auto responses in OTRS (bug#10309).
Merge remote-tracking branch 'upstream/master'