More menu item fixes
Rearrange some action menu items
More menu fixes and subject extra for composing