more OTRS-related mail/spam tweaks

Change-Id: I38c1adb3bd014b73d1c90407284d0cf8bd559836
Merge "more OTRS-related mail/spam tweaks" into production