fixed all messaging issues
improved importing
Merge branch 'master' of github.com:AIFDR/messaging