Mail subscription logic
Mail subscription module merge
Mail subscription merge and changes