Basic mail functionality added