Merge proposals dependent on lp://staging/~intellectronica/launchpad/patch-in-mailnotification

1. patch-in-mailnotification
2. Dependent merge proposals