Move Drawer items back into DrawerActivity

Separating the items and the activity classes they call is not very
useful.
Make "Mail" a string resource and move it up
Snapshot