Bug 818423 - [Email] Apply correct hit state to tool bars

Fix toolbar layout related issues:
 * https://bugzilla.mozilla.org/show_bug.cgi?id=818423
 * https://bugzilla.mozilla.org/show_bug.cgi?id=821399