Fixed up the code in message settings

Fix up the loading and remove the previous span styling due to problem
Merge branch 'abdullah_4.7' into _MEE
changes

changes
Merge branch 'awakeel_6.1' into _MEE

Conflicts:
	apps/bridgemail/autobots/autobot_name.js
	apps/bridgemail/autobots/html/autobots_tile.html
	apps/bridgemail/crm/crm.js
	apps/bridgemail/templates/main_container.html