more layout changes
Merge remote-tracking branch 'Github/more_layout_fixes'

Conflicts:
	app/views/messages/message_from.haml