mail, cleanup and merging with develop branch