Merge remote-tracking branch 'upstream/master'
Imported mails were deleted the second time the poller ran - when moving or deleting of mails was activated.
vier: The background color of the right area is now white.
Merge pull request #658 from annando/master

Mail importing problems, a small "vier" change