[FEATURE] Mailing nearly working