Add mailbox, remove headless

Merged Torsten Grote requested to merge mailbox into master

Merge request reports