mirror of
https://github.com/moparisthebest/k-9
synced 2025-02-28 00:21:49 -05:00

Conflicts: src/com/fsck/k9/Account.java src/com/fsck/k9/K9.java src/com/fsck/k9/Preferences.java src/com/fsck/k9/activity/Accounts.java src/com/fsck/k9/activity/ActivityListener.java src/com/fsck/k9/activity/ChooseFolder.java src/com/fsck/k9/activity/FolderInfoHolder.java src/com/fsck/k9/activity/FolderList.java src/com/fsck/k9/activity/K9Activity.java src/com/fsck/k9/activity/K9ListActivity.java src/com/fsck/k9/activity/MessageList.java src/com/fsck/k9/activity/MessageReference.java src/com/fsck/k9/activity/MessageView.java src/com/fsck/k9/activity/setup/AccountSettings.java src/com/fsck/k9/controller/MessagingController.java src/com/fsck/k9/crypto/Apg.java src/com/fsck/k9/helper/DateFormatter.java src/com/fsck/k9/helper/DomainNameChecker.java src/com/fsck/k9/mail/Address.java src/com/fsck/k9/mail/internet/MimeHeader.java src/com/fsck/k9/mail/internet/MimeMessage.java src/com/fsck/k9/mail/internet/MimeUtility.java src/com/fsck/k9/mail/store/ImapStore.java src/com/fsck/k9/mail/store/LocalStore.java src/com/fsck/k9/mail/store/WebDavStore.java src/com/fsck/k9/mail/transport/SmtpTransport.java src/com/fsck/k9/view/AttachmentView.java