UI fixes after merge from inverse
Merge pull request #40 from Zentyal/mjulian/ui-fix-after-sogo-merge

UI fixes after merge from inverse
Merge branch 'master' into trusty