I was talking to Thomas on IRC and he suggested it would be easier to
close some bugs I opened if I sent along more comprehensive patches.
Well, here's a patchbomb for issue2550757.

Note that it doesn't address the mailgw help patch that I accidenally
attached to that bug via an inadvised “reply”.