Break everything (round 1)
Fix (mostly) everything (round 1) - Partial send mail
Prepare development against 1.6.1