Here is the patch which also implements the config option. Please take a look 
at it and apply if you want to. This definetely needs further testing which I 
cannot do.

I also wasn't able to remove the three attachments from yesterday.

Greetings
Marc