Minor changes regarding mail