Merge pull request #1790 from anandpdoshi/wip-anand

Fixes split email settings, removed clear custom buttons, pos view switch