move mail to separate package