Updated mail system once again