Merge branch 'develop' into maildir-root
more contrast in selected message