Improved compose email
Merge branch 'bs3' of github.com:cirope/mawidabp into bs3
Improved composite email