Updated mail_subscription feature
Merge into master