Merge branch 'master' into issue362

Conflicts:
	src/com/fsck/k9/mail/store/LocalStore.java