Added basic mail saving