Fixed alignment of edit buttons
Fixed passed by reference error
Catch Zend_Mail exceptions
Merge pull request #3 from jbroadway/master

Sync