[TASK] Extend Mailing to handle arrangements as well