Merge proposals dependent on lp://qastaging/~openerp-dev/openobject-addons/7.0-fix-adh-mail_issues

1. 7.0-fix-adh-mail_issues
2. Dependent merge proposals