+act #3246 Added control aware mailbox types
Merge pull request #2050 from drexin/wip-3246-priority-mailbox-drexin

+act #3246 Added control aware mailbox types