Conflicts: k9mail-library/src/main/java/com/fsck/k9/mail/transport/imap/ImapSettings.java src/com/fsck/k9/mail/store/imap/ImapSettings.java src/com/fsck/k9/mail/transport/imap/ImapSettings.java