Squashed commit of the following:

commit 7a7e924adcb5f21422c07931c421a160c485db83
Author: Kyle Lahnakoski <klahnakoski@mozilla.com>
Date:   Thu Apr 17 16:12:54 2014 -0400

    mail sending schema problem

commit e417964835e15dc9d05bcce2b5326c6fd23bc4ac
Author: Kyle Lahnakoski <klahnakoski@mozilla.com>
Date:   Thu Apr 17 15:44:02 2014 -0400

    spacing problem