Bug 1022641 - Message handler is not allways loaded when the app is launched
Merge pull request #20230 from gitmai/bug-1022641-load-of-message-handler

Bug 1022641 - Message handler is not allways loaded when the app is laun...
r=salva