Merged UI with app-mail