Update mailroom

Fixes #2698 (closed) and #2711 (closed).

cc @rspeicher #2698 (closed) is a bug with a new feature, so I think this should go in a patch release.