ims-3

Cleanup layout

No, I had this right the first time

Handle sending emails when the message queue isn't set up

Additional style tweaks

Removing un-needed error handler code