front End for One Mail App
fixed merge conflicts