From 1212f9d0f28fc3bda67c80582e01535c32d34999 Mon Sep 17 00:00:00 2001 From: cketti Date: Fri, 19 Dec 2014 23:05:58 +0100 Subject: [PATCH] Move main application from root project to subproject 'k9mail' --- build.gradle | 125 +----------------- k9mail/build.gradle | 104 +++++++++++++++ .../src/androidTest}/AndroidManifest.xml | 0 .../com/fsck/k9/activity/AccountsTest.java | 0 .../k9/activity/MessageReferenceTest.java | 0 .../com/fsck/k9/helper/FileHelperTest.java | 0 .../com/fsck/k9/helper/HtmlConverterTest.java | 0 .../com/fsck/k9/helper/MessageHelperTest.java | 0 .../java}/com/fsck/k9/mail/MessageTest.java | 0 .../k9/mail/ssl/TrustManagerFactoryTest.java | 0 .../mailstore/LocalMessageExtractorTest.java | 0 .../src/main/AndroidManifest.xml | 0 .../src/main/assets}/downloading.html | 0 .../src/main/assets}/emoticons/24hours.gif | Bin .../src/main/assets}/emoticons/airplane.gif | Bin .../src/main/assets}/emoticons/angry.gif | Bin .../src/main/assets}/emoticons/annoy.gif | Bin .../src/main/assets}/emoticons/apple.gif | Bin .../src/main/assets}/emoticons/appli01.gif | Bin .../src/main/assets}/emoticons/appli02.gif | Bin .../src/main/assets}/emoticons/aquarius.gif | Bin .../src/main/assets}/emoticons/aries.gif | Bin .../src/main/assets}/emoticons/art.gif | Bin .../src/main/assets}/emoticons/atm.gif | Bin .../src/main/assets}/emoticons/bag.gif | Bin .../src/main/assets}/emoticons/ban.gif | Bin .../src/main/assets}/emoticons/banana.gif | Bin .../src/main/assets}/emoticons/bank.gif | Bin .../src/main/assets}/emoticons/bar.gif | Bin .../src/main/assets}/emoticons/baseball.gif | Bin .../src/main/assets}/emoticons/basketball.gif | Bin .../src/main/assets}/emoticons/bearing.gif | Bin .../src/main/assets}/emoticons/beer.gif | Bin .../src/main/assets}/emoticons/bell.gif | Bin .../src/main/assets}/emoticons/bicycle.gif | Bin .../src/main/assets}/emoticons/birthday.gif | Bin .../src/main/assets}/emoticons/bleah.gif | Bin .../src/main/assets}/emoticons/bomb.gif | Bin .../src/main/assets}/emoticons/book.gif | Bin .../src/main/assets}/emoticons/bottle.gif | Bin .../src/main/assets}/emoticons/boutique.gif | Bin .../src/main/assets}/emoticons/bread.gif | Bin .../src/main/assets}/emoticons/bud.gif | Bin .../src/main/assets}/emoticons/building.gif | Bin .../main/assets}/emoticons/bullettrain.gif | Bin .../src/main/assets}/emoticons/bus.gif | Bin .../src/main/assets}/emoticons/by-d.gif | Bin .../src/main/assets}/emoticons/cafe.gif | Bin .../src/main/assets}/emoticons/cake.gif | Bin .../src/main/assets}/emoticons/camera.gif | Bin .../src/main/assets}/emoticons/cancer.gif | Bin .../main/assets}/emoticons/capricornus.gif | Bin .../src/main/assets}/emoticons/car.gif | Bin .../main/assets}/emoticons/carouselpony.gif | Bin .../src/main/assets}/emoticons/cat.gif | Bin .../src/main/assets}/emoticons/catface.gif | Bin .../src/main/assets}/emoticons/cd.gif | Bin .../src/main/assets}/emoticons/chair.gif | Bin .../src/main/assets}/emoticons/cherry.gif | Bin .../main/assets}/emoticons/cherryblossom.gif | Bin .../src/main/assets}/emoticons/chick.gif | Bin .../src/main/assets}/emoticons/clear.gif | Bin .../src/main/assets}/emoticons/clip.gif | Bin .../src/main/assets}/emoticons/clock.gif | Bin .../src/main/assets}/emoticons/cloud.gif | Bin .../src/main/assets}/emoticons/clover.gif | Bin .../src/main/assets}/emoticons/club.gif | Bin .../main/assets}/emoticons/coldsweats01.gif | Bin .../main/assets}/emoticons/coldsweats02.gif | Bin .../src/main/assets}/emoticons/confident.gif | Bin .../src/main/assets}/emoticons/copyright.gif | Bin .../src/main/assets}/emoticons/crown.gif | Bin .../src/main/assets}/emoticons/crying.gif | Bin .../src/main/assets}/emoticons/cute.gif | Bin .../src/main/assets}/emoticons/d-point.gif | Bin .../src/main/assets}/emoticons/danger.gif | Bin .../src/main/assets}/emoticons/dash.gif | Bin .../src/main/assets}/emoticons/delicious.gif | Bin .../src/main/assets}/emoticons/denim.gif | Bin .../src/main/assets}/emoticons/despair.gif | Bin .../src/main/assets}/emoticons/diamond.gif | Bin .../src/main/assets}/emoticons/dog.gif | Bin .../src/main/assets}/emoticons/dollar.gif | Bin .../src/main/assets}/emoticons/door.gif | Bin .../src/main/assets}/emoticons/down.gif | Bin .../main/assets}/emoticons/downwardleft.gif | Bin .../main/assets}/emoticons/downwardright.gif | Bin .../src/main/assets}/emoticons/drama.gif | Bin .../src/main/assets}/emoticons/ear.gif | Bin .../src/main/assets}/emoticons/eight.gif | Bin .../src/main/assets}/emoticons/empty.gif | Bin .../src/main/assets}/emoticons/end.gif | Bin .../src/main/assets}/emoticons/enter.gif | Bin .../src/main/assets}/emoticons/event.gif | Bin .../src/main/assets}/emoticons/eye.gif | Bin .../src/main/assets}/emoticons/eyeglass.gif | Bin .../src/main/assets}/emoticons/fastfood.gif | Bin .../src/main/assets}/emoticons/faxto.gif | Bin .../src/main/assets}/emoticons/fish.gif | Bin .../src/main/assets}/emoticons/five.gif | Bin .../src/main/assets}/emoticons/flag.gif | Bin .../src/main/assets}/emoticons/flair.gif | Bin .../src/main/assets}/emoticons/foot.gif | Bin .../src/main/assets}/emoticons/four.gif | Bin .../src/main/assets}/emoticons/free.gif | Bin .../src/main/assets}/emoticons/freedial.gif | Bin .../src/main/assets}/emoticons/fuji.gif | Bin .../src/main/assets}/emoticons/full.gif | Bin .../src/main/assets}/emoticons/fullmoon.gif | Bin .../src/main/assets}/emoticons/game.gif | Bin .../src/main/assets}/emoticons/gasstation.gif | Bin .../src/main/assets}/emoticons/gawk.gif | Bin .../src/main/assets}/emoticons/gemini.gif | Bin .../src/main/assets}/emoticons/golf.gif | Bin .../src/main/assets}/emoticons/good.gif | Bin .../src/main/assets}/emoticons/hairsalon.gif | Bin .../src/main/assets}/emoticons/happy01.gif | Bin .../src/main/assets}/emoticons/happy02.gif | Bin .../src/main/assets}/emoticons/heart.gif | Bin .../src/main/assets}/emoticons/heart01.gif | Bin .../src/main/assets}/emoticons/heart02.gif | Bin .../src/main/assets}/emoticons/heart03.gif | Bin .../src/main/assets}/emoticons/heart04.gif | Bin .../src/main/assets}/emoticons/horse.gif | Bin .../src/main/assets}/emoticons/hospital.gif | Bin .../src/main/assets}/emoticons/hotel.gif | Bin .../src/main/assets}/emoticons/house.gif | Bin .../src/main/assets}/emoticons/id.gif | Bin .../src/main/assets}/emoticons/impact.gif | Bin .../src/main/assets}/emoticons/info01.gif | Bin .../src/main/assets}/emoticons/info02.gif | Bin .../main/assets}/emoticons/japanesetea.gif | Bin .../src/main/assets}/emoticons/karaoke.gif | Bin .../src/main/assets}/emoticons/key.gif | Bin .../src/main/assets}/emoticons/kissmark.gif | Bin .../src/main/assets}/emoticons/leftright.gif | Bin .../src/main/assets}/emoticons/leo.gif | Bin .../src/main/assets}/emoticons/libra.gif | Bin .../src/main/assets}/emoticons/loveletter.gif | Bin .../src/main/assets}/emoticons/lovely.gif | Bin .../src/main/assets}/emoticons/mail.gif | Bin .../src/main/assets}/emoticons/mailto.gif | Bin .../src/main/assets}/emoticons/maple.gif | Bin .../src/main/assets}/emoticons/memo.gif | Bin .../src/main/assets}/emoticons/mist.gif | Bin .../src/main/assets}/emoticons/mobaq.gif | Bin .../main/assets}/emoticons/mobilephone.gif | Bin .../src/main/assets}/emoticons/moneybag.gif | Bin .../src/main/assets}/emoticons/moon1.gif | Bin .../src/main/assets}/emoticons/moon2.gif | Bin .../src/main/assets}/emoticons/moon3.gif | Bin .../main/assets}/emoticons/motorsports.gif | Bin .../src/main/assets}/emoticons/movie.gif | Bin .../src/main/assets}/emoticons/music.gif | Bin .../src/main/assets}/emoticons/new.gif | Bin .../src/main/assets}/emoticons/newmoon.gif | Bin .../src/main/assets}/emoticons/ng.gif | Bin .../src/main/assets}/emoticons/night.gif | Bin .../src/main/assets}/emoticons/nine.gif | Bin .../src/main/assets}/emoticons/noodle.gif | Bin .../src/main/assets}/emoticons/nosmoking.gif | Bin .../src/main/assets}/emoticons/note.gif | Bin .../src/main/assets}/emoticons/notes.gif | Bin .../src/main/assets}/emoticons/ok.gif | Bin .../src/main/assets}/emoticons/on.gif | Bin .../src/main/assets}/emoticons/one.gif | Bin .../src/main/assets}/emoticons/paper.gif | Bin .../src/main/assets}/emoticons/parking.gif | Bin .../src/main/assets}/emoticons/pass.gif | Bin .../src/main/assets}/emoticons/pc.gif | Bin .../src/main/assets}/emoticons/pen.gif | Bin .../src/main/assets}/emoticons/pencil.gif | Bin .../src/main/assets}/emoticons/penguin.gif | Bin .../src/main/assets}/emoticons/phoneto.gif | Bin .../src/main/assets}/emoticons/pig.gif | Bin .../src/main/assets}/emoticons/pisces.gif | Bin .../src/main/assets}/emoticons/pocketbell.gif | Bin .../src/main/assets}/emoticons/postoffice.gif | Bin .../src/main/assets}/emoticons/pouch.gif | Bin .../src/main/assets}/emoticons/pout.gif | Bin .../src/main/assets}/emoticons/present.gif | Bin .../src/main/assets}/emoticons/punch.gif | Bin .../src/main/assets}/emoticons/r-mark.gif | Bin .../src/main/assets}/emoticons/rain.gif | Bin .../src/main/assets}/emoticons/recycle.gif | Bin .../src/main/assets}/emoticons/restaurant.gif | Bin .../src/main/assets}/emoticons/ribbon.gif | Bin .../src/main/assets}/emoticons/riceball.gif | Bin .../src/main/assets}/emoticons/ring.gif | Bin .../src/main/assets}/emoticons/rock.gif | Bin .../src/main/assets}/emoticons/rouge.gif | Bin .../src/main/assets}/emoticons/run.gif | Bin .../src/main/assets}/emoticons/rvcar.gif | Bin .../src/main/assets}/emoticons/sad.gif | Bin .../main/assets}/emoticons/sagittarius.gif | Bin .../src/main/assets}/emoticons/sandclock.gif | Bin .../src/main/assets}/emoticons/school.gif | Bin .../src/main/assets}/emoticons/scissors.gif | Bin .../src/main/assets}/emoticons/scorpius.gif | Bin .../src/main/assets}/emoticons/search.gif | Bin .../src/main/assets}/emoticons/secret.gif | Bin .../src/main/assets}/emoticons/seven.gif | Bin .../src/main/assets}/emoticons/shadow.gif | Bin .../src/main/assets}/emoticons/sharp.gif | Bin .../src/main/assets}/emoticons/shine.gif | Bin .../src/main/assets}/emoticons/ship.gif | Bin .../src/main/assets}/emoticons/shock.gif | Bin .../src/main/assets}/emoticons/shoe.gif | Bin .../src/main/assets}/emoticons/sign01.gif | Bin .../src/main/assets}/emoticons/sign02.gif | Bin .../src/main/assets}/emoticons/sign03.gif | Bin .../src/main/assets}/emoticons/sign04.gif | Bin .../src/main/assets}/emoticons/sign05.gif | Bin .../src/main/assets}/emoticons/signaler.gif | Bin .../src/main/assets}/emoticons/six.gif | Bin .../src/main/assets}/emoticons/ski.gif | Bin .../src/main/assets}/emoticons/slate.gif | Bin .../src/main/assets}/emoticons/sleepy.gif | Bin .../src/main/assets}/emoticons/smile.gif | Bin .../src/main/assets}/emoticons/smoking.gif | Bin .../src/main/assets}/emoticons/snail.gif | Bin .../src/main/assets}/emoticons/snow.gif | Bin .../src/main/assets}/emoticons/snowboard.gif | Bin .../src/main/assets}/emoticons/soccer.gif | Bin .../src/main/assets}/emoticons/soon.gif | Bin .../src/main/assets}/emoticons/spa.gif | Bin .../src/main/assets}/emoticons/spade.gif | Bin .../src/main/assets}/emoticons/sports.gif | Bin .../src/main/assets}/emoticons/sprinkle.gif | Bin .../src/main/assets}/emoticons/subway.gif | Bin .../src/main/assets}/emoticons/sun.gif | Bin .../src/main/assets}/emoticons/sweat01.gif | Bin .../src/main/assets}/emoticons/sweat02.gif | Bin .../src/main/assets}/emoticons/t-shirt.gif | Bin .../src/main/assets}/emoticons/taurus.gif | Bin .../src/main/assets}/emoticons/telephone.gif | Bin .../src/main/assets}/emoticons/tennis.gif | Bin .../src/main/assets}/emoticons/think.gif | Bin .../src/main/assets}/emoticons/three.gif | Bin .../src/main/assets}/emoticons/thunder.gif | Bin .../src/main/assets}/emoticons/ticket.gif | Bin .../src/main/assets}/emoticons/tm.gif | Bin .../src/main/assets}/emoticons/toilet.gif | Bin .../src/main/assets}/emoticons/train.gif | Bin .../src/main/assets}/emoticons/tulip.gif | Bin .../src/main/assets}/emoticons/tv.gif | Bin .../src/main/assets}/emoticons/two.gif | Bin .../src/main/assets}/emoticons/typhoon.gif | Bin .../src/main/assets}/emoticons/up.gif | Bin .../src/main/assets}/emoticons/updown.gif | Bin .../src/main/assets}/emoticons/upwardleft.gif | Bin .../main/assets}/emoticons/upwardright.gif | Bin .../src/main/assets}/emoticons/virgo.gif | Bin .../src/main/assets}/emoticons/watch.gif | Bin .../src/main/assets}/emoticons/wave.gif | Bin .../src/main/assets}/emoticons/weep.gif | Bin .../src/main/assets}/emoticons/wheelchair.gif | Bin .../src/main/assets}/emoticons/wine.gif | Bin .../src/main/assets}/emoticons/wink.gif | Bin .../src/main/assets}/emoticons/wobbly.gif | Bin .../src/main/assets}/emoticons/wrench.gif | Bin .../src/main/assets}/emoticons/xmas.gif | Bin .../src/main/assets}/emoticons/yacht.gif | Bin .../src/main/assets}/emoticons/yen.gif | Bin .../src/main/assets}/emoticons/zero.gif | Bin {assets => k9mail/src/main/assets}/icon.png | Bin .../src/main/assets}/loading.gif | Bin .../src/main/java}/com/fsck/k9/Account.java | 0 .../main/java}/com/fsck/k9/AccountStats.java | 0 .../main/java}/com/fsck/k9/BaseAccount.java | 0 .../src/main/java}/com/fsck/k9/Clock.java | 0 .../com/fsck/k9/EmailAddressAdapter.java | 0 .../com/fsck/k9/EmailAddressValidator.java | 0 .../src/main/java}/com/fsck/k9/FontSizes.java | 0 .../src/main/java}/com/fsck/k9/Identity.java | 0 .../src/main/java}/com/fsck/k9/K9.java | 0 .../com/fsck/k9/NotificationSetting.java | 0 .../src/main/java}/com/fsck/k9/PRNGFixes.java | 0 .../main/java}/com/fsck/k9/Preferences.java | 0 .../src/main/java}/com/fsck/k9/Throttle.java | 0 .../com/fsck/k9/activity/AccountList.java | 0 .../java}/com/fsck/k9/activity/Accounts.java | 0 .../fsck/k9/activity/ActivityListener.java | 0 .../com/fsck/k9/activity/ChooseFolder.java | 0 .../com/fsck/k9/activity/ChooseIdentity.java | 0 .../fsck/k9/activity/ColorPickerDialog.java | 0 .../fsck/k9/activity/ConfirmationDialog.java | 0 .../com/fsck/k9/activity/EditIdentity.java | 0 .../fsck/k9/activity/EmailAddressList.java | 0 .../fsck/k9/activity/FolderInfoHolder.java | 0 .../com/fsck/k9/activity/FolderList.java | 0 .../fsck/k9/activity/FolderListFilter.java | 0 .../k9/activity/InsertableHtmlContent.java | 0 .../com/fsck/k9/activity/K9Activity.java | 0 .../fsck/k9/activity/K9ActivityCommon.java | 0 .../com/fsck/k9/activity/K9ListActivity.java | 0 .../k9/activity/K9PreferenceActivity.java | 0 .../fsck/k9/activity/LauncherShortcuts.java | 0 .../fsck/k9/activity/ManageIdentities.java | 0 .../com/fsck/k9/activity/MessageCompose.java | 0 .../fsck/k9/activity/MessageInfoHolder.java | 0 .../com/fsck/k9/activity/MessageList.java | 0 .../fsck/k9/activity/MessageReference.java | 0 .../NotificationDeleteConfirmation.java | 0 .../java}/com/fsck/k9/activity/Search.java | 0 .../com/fsck/k9/activity/TextBodyBuilder.java | 0 .../activity/UnreadWidgetConfiguration.java | 0 .../fsck/k9/activity/UpgradeDatabases.java | 0 .../loader/AttachmentContentLoader.java | 0 .../activity/loader/AttachmentInfoLoader.java | 0 .../com/fsck/k9/activity/misc/Attachment.java | 0 .../activity/misc/ContactPictureLoader.java | 0 .../k9/activity/misc/ExtendedAsyncTask.java | 0 .../misc/NonConfigurationInstance.java | 0 .../activity/misc/SwipeGestureDetector.java | 0 .../k9/activity/setup/AccountSettings.java | 0 .../setup/AccountSetupAccountType.java | 0 .../k9/activity/setup/AccountSetupBasics.java | 0 .../setup/AccountSetupCheckSettings.java | 0 .../setup/AccountSetupComposition.java | 0 .../activity/setup/AccountSetupIncoming.java | 0 .../k9/activity/setup/AccountSetupNames.java | 0 .../activity/setup/AccountSetupOptions.java | 0 .../activity/setup/AccountSetupOutgoing.java | 0 .../k9/activity/setup/AuthTypeAdapter.java | 0 .../k9/activity/setup/AuthTypeHolder.java | 0 .../setup/ConnectionSecurityAdapter.java | 0 .../setup/ConnectionSecurityHolder.java | 0 .../k9/activity/setup/FolderSettings.java | 0 .../k9/activity/setup/FontSizeSettings.java | 0 .../com/fsck/k9/activity/setup/Prefs.java | 0 .../k9/activity/setup/SliderPreference.java | 0 .../fsck/k9/activity/setup/SpinnerOption.java | 0 .../k9/activity/setup/WelcomeMessage.java | 0 .../com/fsck/k9/cache/EmailProviderCache.java | 0 .../k9/cache/EmailProviderCacheCursor.java | 0 .../k9/cache/TemporaryAttachmentStore.java | 0 .../k9/controller/MessagingController.java | 0 .../MessagingControllerPushReceiver.java | 0 .../fsck/k9/controller/MessagingListener.java | 0 .../UnavailableAccountException.java | 0 .../com/fsck/k9/crypto/CryptoHelper.java | 0 .../com/fsck/k9/crypto/OpenPgpApiHelper.java | 0 .../java}/com/fsck/k9/crypto/PgpData.java | 0 .../fragment/ConfirmationDialogFragment.java | 0 .../fsck/k9/fragment/MessageListFragment.java | 0 .../fsck/k9/fragment/MessageViewFragment.java | 0 .../k9/fragment/ProgressDialogFragment.java | 0 .../com/fsck/k9/helper/ClipboardManager.java | 0 .../java}/com/fsck/k9/helper/ContactItem.java | 0 .../com/fsck/k9/helper/ContactPicture.java | 0 .../java}/com/fsck/k9/helper/Contacts.java | 0 .../com/fsck/k9/helper/FileBrowserHelper.java | 0 .../java}/com/fsck/k9/helper/FileHelper.java | 0 .../com/fsck/k9/helper/HtmlConverter.java | 0 .../com/fsck/k9/helper/IdentityHelper.java | 0 .../fsck/k9/helper/MediaScannerNotifier.java | 0 .../java}/com/fsck/k9/helper/MergeCursor.java | 0 .../k9/helper/MergeCursorWithUniqueId.java | 0 .../com/fsck/k9/helper/MessageHelper.java | 0 .../com/fsck/k9/helper/SizeFormatter.java | 0 .../com/fsck/k9/helper/UrlEncodingHelper.java | 0 .../java}/com/fsck/k9/helper/Utility.java | 0 .../k9/helper/power/TracingPowerManager.java | 0 .../main/java}/com/fsck/k9/mail/Address.java | 0 .../main/java}/com/fsck/k9/mail/AuthType.java | 0 .../com/fsck/k9/mail/Authentication.java | 0 .../mail/AuthenticationFailedException.java | 0 .../src/main/java}/com/fsck/k9/mail/Body.java | 0 .../main/java}/com/fsck/k9/mail/BodyPart.java | 0 .../k9/mail/CertificateChainException.java | 0 .../mail/CertificateValidationException.java | 0 .../java}/com/fsck/k9/mail/CompositeBody.java | 0 .../com/fsck/k9/mail/ConnectionSecurity.java | 0 .../java}/com/fsck/k9/mail/FetchProfile.java | 0 .../src/main/java}/com/fsck/k9/mail/Flag.java | 0 .../main/java}/com/fsck/k9/mail/Folder.java | 0 .../java}/com/fsck/k9/mail/K9MailLib.java | 0 .../main/java}/com/fsck/k9/mail/Message.java | 0 .../k9/mail/MessageRetrievalListener.java | 0 .../com/fsck/k9/mail/MessagingException.java | 0 .../java}/com/fsck/k9/mail/Multipart.java | 0 .../src/main/java}/com/fsck/k9/mail/Part.java | 0 .../java}/com/fsck/k9/mail/PushReceiver.java | 0 .../main/java}/com/fsck/k9/mail/Pusher.java | 0 .../com/fsck/k9/mail/ServerSettings.java | 0 .../main/java}/com/fsck/k9/mail/Store.java | 0 .../java}/com/fsck/k9/mail/Transport.java | 0 .../java}/com/fsck/k9/mail/filter/Base64.java | 0 .../k9/mail/filter/Base64OutputStream.java | 0 .../k9/mail/filter/CountingOutputStream.java | 0 .../filter/EOLConvertingOutputStream.java | 0 .../mail/filter/FixedLengthInputStream.java | 0 .../java}/com/fsck/k9/mail/filter/Hex.java | 0 .../k9/mail/filter/LineWrapOutputStream.java | 0 .../k9/mail/filter/PeekableInputStream.java | 0 .../fsck/k9/mail/filter/SmtpDataStuffing.java | 0 .../k9/mail/internet/BinaryTempFileBody.java | 0 .../internet/BinaryTempFileMessageBody.java | 0 .../fsck/k9/mail/internet/CharsetSupport.java | 0 .../fsck/k9/mail/internet/DecoderUtil.java | 0 .../fsck/k9/mail/internet/EncoderUtil.java | 0 .../Iso2022JpToShiftJisInputStream.java | 0 .../com/fsck/k9/mail/internet/JisSupport.java | 0 .../k9/mail/internet/MessageExtractor.java | 0 .../fsck/k9/mail/internet/MimeBodyPart.java | 0 .../com/fsck/k9/mail/internet/MimeHeader.java | 0 .../fsck/k9/mail/internet/MimeMessage.java | 0 .../fsck/k9/mail/internet/MimeMultipart.java | 0 .../fsck/k9/mail/internet/MimeUtility.java | 0 .../com/fsck/k9/mail/internet/TextBody.java | 0 .../com/fsck/k9/mail/internet/Viewable.java | 0 .../mail/ssl/DefaultTrustedSocketFactory.java | 0 .../fsck/k9/mail/ssl/KeyChainKeyManager.java | 0 .../com/fsck/k9/mail/ssl/LocalKeyStore.java | 0 .../fsck/k9/mail/ssl/TrustManagerFactory.java | 0 .../k9/mail/ssl/TrustedSocketFactory.java | 0 .../com/fsck/k9/mail/store/RemoteStore.java | 0 .../com/fsck/k9/mail/store/StoreConfig.java | 0 .../fsck/k9/mail/store/imap/ImapCommands.java | 0 .../k9/mail/store/imap/ImapConnection.java | 0 .../k9/mail/store/imap/ImapException.java | 0 .../com/fsck/k9/mail/store/imap/ImapList.java | 0 .../fsck/k9/mail/store/imap/ImapResponse.java | 0 .../mail/store/imap/ImapResponseCallback.java | 0 .../mail/store/imap/ImapResponseParser.java | 0 .../fsck/k9/mail/store/imap/ImapStore.java | 0 .../fsck/k9/mail/store/imap/ImapUtility.java | 0 .../k9/mail/store/imap/UntaggedHandler.java | 0 .../fsck/k9/mail/store/pop3/Pop3Store.java | 0 .../store/webdav/WebDavSocketFactory.java | 0 .../k9/mail/store/webdav/WebDavStore.java | 0 .../fsck/k9/mail/transport/SmtpTransport.java | 0 .../k9/mail/transport/WebDavTransport.java | 0 .../k9/mail/transport/imap/ImapSettings.java | 0 .../mailstore/AttachmentMessageBodyUtil.java | 0 .../k9/mailstore/BinaryAttachmentBody.java | 0 .../k9/mailstore/LocalAttachmentBody.java | 0 .../k9/mailstore/LocalAttachmentBodyPart.java | 0 .../mailstore/LocalAttachmentMessageBody.java | 0 .../com/fsck/k9/mailstore/LocalFolder.java | 0 .../com/fsck/k9/mailstore/LocalMessage.java | 0 .../k9/mailstore/LocalMessageExtractor.java | 0 .../com/fsck/k9/mailstore/LocalStore.java | 0 .../com/fsck/k9/mailstore/LocalTextBody.java | 0 .../fsck/k9/mailstore/LockableDatabase.java | 0 .../k9/mailstore/MessageRemovalListener.java | 0 .../com/fsck/k9/mailstore/StorageManager.java | 0 .../k9/mailstore/StoreSchemaDefinition.java | 0 .../com/fsck/k9/mailstore/TempFileBody.java | 0 .../k9/mailstore/TempFileMessageBody.java | 0 .../com/fsck/k9/mailstore/ThreadInfo.java | 0 .../UnavailableStorageException.java | 0 .../fsck/k9/mailstore/ViewableContainer.java | 0 .../fsck/k9/preferences/AccountSettings.java | 0 .../preferences/CheckBoxListPreference.java | 0 .../java}/com/fsck/k9/preferences/Editor.java | 0 .../fsck/k9/preferences/FolderSettings.java | 0 .../fsck/k9/preferences/GlobalSettings.java | 0 .../fsck/k9/preferences/IdentitySettings.java | 0 .../com/fsck/k9/preferences/Settings.java | 0 .../fsck/k9/preferences/SettingsExporter.java | 0 .../SettingsImportExportException.java | 0 .../fsck/k9/preferences/SettingsImporter.java | 0 .../com/fsck/k9/preferences/Storage.java | 0 .../k9/preferences/TimePickerPreference.java | 0 .../fsck/k9/provider/AttachmentProvider.java | 0 .../com/fsck/k9/provider/EmailProvider.java | 0 .../com/fsck/k9/provider/MessageProvider.java | 0 .../k9/provider/UnreadWidgetProvider.java | 0 .../k9/remotecontrol/AccountReceiver.java | 0 .../k9/remotecontrol/K9AccountReceptor.java | 0 .../k9/remotecontrol/K9RemoteControl.java | 0 .../fsck/k9/search/ConditionsTreeNode.java | 0 .../java}/com/fsck/k9/search/LocalSearch.java | 0 .../com/fsck/k9/search/SearchAccount.java | 0 .../fsck/k9/search/SearchSpecification.java | 0 .../com/fsck/k9/search/SqlQueryBuilder.java | 0 .../com/fsck/k9/service/BootReceiver.java | 0 .../com/fsck/k9/service/CoreReceiver.java | 0 .../com/fsck/k9/service/CoreService.java | 0 .../k9/service/DatabaseUpgradeService.java | 0 .../com/fsck/k9/service/MailService.java | 0 .../k9/service/NotificationActionService.java | 0 .../com/fsck/k9/service/PollService.java | 0 .../com/fsck/k9/service/PushService.java | 0 .../k9/service/RemoteControlReceiver.java | 0 .../fsck/k9/service/RemoteControlService.java | 0 .../com/fsck/k9/service/ShutdownReceiver.java | 0 .../com/fsck/k9/service/SleepService.java | 0 .../fsck/k9/service/StorageGoneReceiver.java | 0 .../com/fsck/k9/service/StorageReceiver.java | 0 .../com/fsck/k9/view/AttachmentView.java | 0 .../k9/view/ClientCertificateSpinner.java | 0 .../java}/com/fsck/k9/view/ColorChip.java | 0 .../fsck/k9/view/FoldableLinearLayout.java | 0 .../fsck/k9/view/K9PullToRefreshListView.java | 0 .../java}/com/fsck/k9/view/MessageHeader.java | 0 .../com/fsck/k9/view/MessageOpenPgpView.java | 0 .../com/fsck/k9/view/MessageTitleView.java | 0 .../com/fsck/k9/view/MessageWebView.java | 0 .../fsck/k9/view/NonLockingScrollView.java | 0 .../java}/com/fsck/k9/view/RigidWebView.java | 0 .../com/fsck/k9/view/SingleMessageView.java | 0 .../java}/com/fsck/k9/view/ViewSwitcher.java | 0 .../src/main/res}/anim/slide_in_left.xml | 0 .../src/main/res}/anim/slide_in_right.xml | 0 .../src/main/res}/anim/slide_out_left.xml | 0 .../src/main/res}/anim/slide_out_right.xml | 0 .../action_search_folder_dark.png | Bin .../action_search_folder_light.png | Bin .../attached_image_placeholder.png | Bin .../attachment_text_box_dark.9.png | Bin .../attachment_text_box_light.9.png | Bin .../btn_check_off_normal_holo_dark.png | Bin .../btn_check_off_normal_holo_light.png | Bin .../btn_check_on_normal_holo_dark.png | Bin .../btn_check_on_normal_holo_light.png | Bin .../res}/drawable-hdpi/btn_dialog_disable.png | Bin .../res}/drawable-hdpi/btn_dialog_normal.png | Bin .../res}/drawable-hdpi/btn_dialog_pressed.png | Bin .../drawable-hdpi/btn_dialog_selected.png | Bin .../res}/drawable-hdpi/btn_edit_disable.png | Bin .../res}/drawable-hdpi/btn_edit_normal.png | Bin .../res}/drawable-hdpi/btn_edit_pressed.png | Bin .../res}/drawable-hdpi/btn_edit_selected.png | Bin .../divider_horizontal_email.9.png | Bin .../dropdown_ic_arrow_normal_holo_dark.png | Bin .../dropdown_ic_arrow_normal_holo_light.png | Bin .../main/res}/drawable-hdpi/folder_dark.png | Bin .../main/res}/drawable-hdpi/folder_light.png | Bin .../drawable-hdpi/ic_action_about_dark.png | Bin .../drawable-hdpi/ic_action_about_light.png | Bin .../ic_action_add_attachment_dark.png | Bin .../ic_action_add_attachment_light.png | Bin .../ic_action_add_cc_bbc_light.png | Bin .../ic_action_add_cc_bcc_dark.png | Bin .../res}/drawable-hdpi/ic_action_add_dark.png | Bin .../drawable-hdpi/ic_action_add_light.png | Bin .../drawable-hdpi/ic_action_archive_dark.png | Bin .../drawable-hdpi/ic_action_archive_light.png | Bin .../drawable-hdpi/ic_action_cancel_dark.png | Bin .../drawable-hdpi/ic_action_cancel_light.png | Bin .../drawable-hdpi/ic_action_collapse_dark.png | Bin .../ic_action_collapse_light.png | Bin .../drawable-hdpi/ic_action_compose_dark.png | Bin .../drawable-hdpi/ic_action_compose_light.png | Bin .../drawable-hdpi/ic_action_copy_dark.png | Bin .../drawable-hdpi/ic_action_copy_light.png | Bin .../drawable-hdpi/ic_action_delete_dark.png | Bin .../drawable-hdpi/ic_action_delete_light.png | Bin .../drawable-hdpi/ic_action_expand_dark.png | Bin .../drawable-hdpi/ic_action_expand_light.png | Bin .../drawable-hdpi/ic_action_flag_dark.png | Bin .../drawable-hdpi/ic_action_flag_light.png | Bin .../ic_action_import_export_dark.png | Bin .../ic_action_import_export_light.png | Bin .../ic_action_mark_as_read_dark.png | Bin .../ic_action_mark_as_read_light.png | Bin .../ic_action_mark_as_unread_dark.png | Bin .../ic_action_mark_as_unread_light.png | Bin .../drawable-hdpi/ic_action_move_dark.png | Bin .../drawable-hdpi/ic_action_move_light.png | Bin .../ic_action_next_message_dark.png | Bin .../ic_action_next_message_light.png | Bin .../ic_action_previous_message_dark.png | Bin .../ic_action_previous_message_light.png | Bin .../drawable-hdpi/ic_action_refresh_dark.png | Bin .../drawable-hdpi/ic_action_refresh_light.png | Bin .../ic_action_remote_search_dark.png | Bin .../ic_action_remote_search_light.png | Bin .../ic_action_request_read_receipt_dark.png | Bin .../ic_action_request_read_receipt_light.png | Bin .../drawable-hdpi/ic_action_save_dark.png | Bin .../drawable-hdpi/ic_action_save_light.png | Bin .../drawable-hdpi/ic_action_search_dark.png | Bin .../drawable-hdpi/ic_action_search_light.png | Bin .../ic_action_select_all_dark.png | Bin .../ic_action_select_all_light.png | Bin .../drawable-hdpi/ic_action_send_dark.png | Bin .../drawable-hdpi/ic_action_send_light.png | Bin .../drawable-hdpi/ic_action_settings_dark.png | Bin .../ic_action_settings_light.png | Bin .../ic_action_single_message_options_dark.png | Bin ...ic_action_single_message_options_light.png | Bin .../drawable-hdpi/ic_action_sort_dark.png | Bin .../drawable-hdpi/ic_action_sort_light.png | Bin .../drawable-hdpi/ic_action_spam_dark.png | Bin .../drawable-hdpi/ic_action_spam_light.png | Bin .../drawable-hdpi/ic_action_unflag_dark.png | Bin .../drawable-hdpi/ic_action_unflag_light.png | Bin .../drawable-hdpi/ic_action_upload_dark.png | Bin .../drawable-hdpi/ic_action_upload_light.png | Bin .../ic_button_add_contact_dark.png | Bin .../ic_button_add_contact_light.png | Bin .../res}/drawable-hdpi/ic_contact_picture.png | Bin .../src/main/res}/drawable-hdpi/ic_delete.png | Bin .../drawable-hdpi/ic_email_answered_small.png | Bin .../drawable-hdpi/ic_email_attachment.png | Bin .../ic_email_attachment_small.png | Bin .../ic_email_forwarded_small.png | Bin .../ic_notify_check_mail_anim_0.png | Bin .../ic_notify_check_mail_anim_1.png | Bin .../ic_notify_check_mail_anim_2.png | Bin .../ic_notify_check_mail_anim_3.png | Bin .../ic_notify_check_mail_anim_4.png | Bin .../ic_notify_check_mail_anim_5.png | Bin .../res}/drawable-hdpi/ic_notify_new_mail.png | Bin .../res}/drawable-hdpi/ic_unread_widget.png | Bin .../ic_unread_widget_selected.png | Bin .../src/main/res}/drawable-hdpi/icon.png | Bin .../main/res}/drawable-hdpi/overlay_error.png | Bin .../main/res}/drawable-hdpi/overlay_ok.png | Bin .../drawable-hdpi/preview_unread_widget.png | Bin .../action_search_folder_dark.png | Bin .../action_search_folder_light.png | Bin .../attached_image_placeholder.png | Bin .../attachment_text_box_dark.9.png | Bin .../attachment_text_box_light.9.png | Bin .../btn_check_off_normal_holo_dark.png | Bin .../btn_check_off_normal_holo_light.png | Bin .../btn_check_on_normal_holo_dark.png | Bin .../btn_check_on_normal_holo_light.png | Bin .../res}/drawable-mdpi/btn_dialog_disable.png | Bin .../res}/drawable-mdpi/btn_dialog_normal.png | Bin .../res}/drawable-mdpi/btn_dialog_pressed.png | Bin .../drawable-mdpi/btn_dialog_selected.png | Bin .../res}/drawable-mdpi/btn_edit_disable.png | Bin .../res}/drawable-mdpi/btn_edit_normal.png | Bin .../res}/drawable-mdpi/btn_edit_pressed.png | Bin .../res}/drawable-mdpi/btn_edit_selected.png | Bin .../divider_horizontal_email.9.png | Bin .../dropdown_ic_arrow_normal_holo_dark.png | Bin .../dropdown_ic_arrow_normal_holo_light.png | Bin .../main/res}/drawable-mdpi/folder_dark.png | Bin .../main/res}/drawable-mdpi/folder_light.png | Bin .../drawable-mdpi/ic_action_about_dark.png | Bin .../drawable-mdpi/ic_action_about_light.png | Bin .../ic_action_add_attachment_dark.png | Bin .../ic_action_add_attachment_light.png | Bin .../ic_action_add_cc_bbc_light.png | Bin .../ic_action_add_cc_bcc_dark.png | Bin .../res}/drawable-mdpi/ic_action_add_dark.png | Bin .../drawable-mdpi/ic_action_add_light.png | Bin .../drawable-mdpi/ic_action_archive_dark.png | Bin .../drawable-mdpi/ic_action_archive_light.png | Bin .../drawable-mdpi/ic_action_cancel_dark.png | Bin .../drawable-mdpi/ic_action_cancel_light.png | Bin .../drawable-mdpi/ic_action_collapse_dark.png | Bin .../ic_action_collapse_light.png | Bin .../drawable-mdpi/ic_action_compose_dark.png | Bin .../drawable-mdpi/ic_action_compose_light.png | Bin .../drawable-mdpi/ic_action_copy_dark.png | Bin .../drawable-mdpi/ic_action_copy_light.png | Bin .../drawable-mdpi/ic_action_delete_dark.png | Bin .../drawable-mdpi/ic_action_delete_light.png | Bin .../drawable-mdpi/ic_action_expand_dark.png | Bin .../drawable-mdpi/ic_action_expand_light.png | Bin .../drawable-mdpi/ic_action_flag_dark.png | Bin .../drawable-mdpi/ic_action_flag_light.png | Bin .../ic_action_import_export_dark.png | Bin .../ic_action_import_export_light.png | Bin .../ic_action_mark_as_read_dark.png | Bin .../ic_action_mark_as_read_light.png | Bin .../ic_action_mark_as_unread_dark.png | Bin .../ic_action_mark_as_unread_light.png | Bin .../drawable-mdpi/ic_action_move_dark.png | Bin .../drawable-mdpi/ic_action_move_light.png | Bin .../ic_action_next_message_dark.png | Bin .../ic_action_next_message_light.png | Bin .../ic_action_previous_message_dark.png | Bin .../ic_action_previous_message_light.png | Bin .../drawable-mdpi/ic_action_refresh_dark.png | Bin .../drawable-mdpi/ic_action_refresh_light.png | Bin .../ic_action_remote_search_dark.png | Bin .../ic_action_remote_search_light.png | Bin .../ic_action_request_read_receipt_dark.png | Bin .../ic_action_request_read_receipt_light.png | Bin .../drawable-mdpi/ic_action_save_dark.png | Bin .../drawable-mdpi/ic_action_save_light.png | Bin .../drawable-mdpi/ic_action_search_dark.png | Bin .../drawable-mdpi/ic_action_search_light.png | Bin .../ic_action_select_all_dark.png | Bin .../ic_action_select_all_light.png | Bin .../drawable-mdpi/ic_action_send_dark.png | Bin .../drawable-mdpi/ic_action_send_light.png | Bin .../drawable-mdpi/ic_action_settings_dark.png | Bin .../ic_action_settings_light.png | Bin .../ic_action_single_message_options_dark.png | Bin ...ic_action_single_message_options_light.png | Bin .../drawable-mdpi/ic_action_sort_dark.png | Bin .../drawable-mdpi/ic_action_sort_light.png | Bin .../drawable-mdpi/ic_action_spam_dark.png | Bin .../drawable-mdpi/ic_action_spam_light.png | Bin .../drawable-mdpi/ic_action_unflag_dark.png | Bin .../drawable-mdpi/ic_action_unflag_light.png | Bin .../drawable-mdpi/ic_action_upload_dark.png | Bin .../drawable-mdpi/ic_action_upload_light.png | Bin .../ic_button_add_contact_dark.png | Bin .../ic_button_add_contact_light.png | Bin .../res}/drawable-mdpi/ic_contact_picture.png | Bin .../src/main/res}/drawable-mdpi/ic_delete.png | Bin .../drawable-mdpi/ic_email_answered_small.png | Bin .../drawable-mdpi/ic_email_attachment.png | Bin .../ic_email_attachment_small.png | Bin .../ic_email_forwarded_answered_small.png | Bin .../ic_email_forwarded_small.png | Bin .../ic_notify_check_mail_anim_0.png | Bin .../ic_notify_check_mail_anim_1.png | Bin .../ic_notify_check_mail_anim_2.png | Bin .../ic_notify_check_mail_anim_3.png | Bin .../ic_notify_check_mail_anim_4.png | Bin .../ic_notify_check_mail_anim_5.png | Bin .../res}/drawable-mdpi/ic_notify_new_mail.png | Bin .../res}/drawable-mdpi/ic_unread_widget.png | Bin .../ic_unread_widget_selected.png | Bin .../src/main/res}/drawable-mdpi/icon.png | Bin .../main/res}/drawable-mdpi/overlay_error.png | Bin .../main/res}/drawable-mdpi/overlay_ok.png | Bin .../res}/drawable-mdpi/panel_separator.9.png | Bin .../res}/drawable-mdpi/popup_background.9.png | Bin .../main/res}/drawable-mdpi/signed_large.png | Bin .../ic_action_delete_dark_vector.xml | 0 .../ic_action_mark_as_read_dark_vector.xml | 0 ...ion_single_message_options_dark_vector.xml | 0 .../ic_notify_new_mail_vector.xml | 0 .../action_search_folder_dark.png | Bin .../action_search_folder_light.png | Bin .../btn_check_off_normal_holo_dark.png | Bin .../btn_check_off_normal_holo_light.png | Bin .../btn_check_on_normal_holo_dark.png | Bin .../btn_check_on_normal_holo_light.png | Bin .../dropdown_ic_arrow_normal_holo_dark.png | Bin .../dropdown_ic_arrow_normal_holo_light.png | Bin .../main/res}/drawable-xhdpi/folder_dark.png | Bin .../main/res}/drawable-xhdpi/folder_light.png | Bin .../drawable-xhdpi/ic_action_about_dark.png | Bin .../drawable-xhdpi/ic_action_about_light.png | Bin .../ic_action_add_attachment_dark.png | Bin .../ic_action_add_attachment_light.png | Bin .../ic_action_add_cc_bbc_light.png | Bin .../ic_action_add_cc_bcc_dark.png | Bin .../drawable-xhdpi/ic_action_add_dark.png | Bin .../drawable-xhdpi/ic_action_add_light.png | Bin .../drawable-xhdpi/ic_action_archive_dark.png | Bin .../ic_action_archive_light.png | Bin .../drawable-xhdpi/ic_action_cancel_dark.png | Bin .../drawable-xhdpi/ic_action_cancel_light.png | Bin .../ic_action_collapse_dark.png | Bin .../ic_action_collapse_light.png | Bin .../drawable-xhdpi/ic_action_compose_dark.png | Bin .../ic_action_compose_light.png | Bin .../drawable-xhdpi/ic_action_copy_dark.png | Bin .../drawable-xhdpi/ic_action_copy_light.png | Bin .../drawable-xhdpi/ic_action_delete_dark.png | Bin .../drawable-xhdpi/ic_action_delete_light.png | Bin .../drawable-xhdpi/ic_action_expand_dark.png | Bin .../drawable-xhdpi/ic_action_expand_light.png | Bin .../drawable-xhdpi/ic_action_flag_dark.png | Bin .../drawable-xhdpi/ic_action_flag_light.png | Bin .../ic_action_import_export_dark.png | Bin .../ic_action_import_export_light.png | Bin .../ic_action_mark_as_read_dark.png | Bin .../ic_action_mark_as_read_light.png | Bin .../ic_action_mark_as_unread_dark.png | Bin .../ic_action_mark_as_unread_light.png | Bin .../drawable-xhdpi/ic_action_move_dark.png | Bin .../drawable-xhdpi/ic_action_move_light.png | Bin .../ic_action_next_message_dark.png | Bin .../ic_action_next_message_light.png | Bin .../ic_action_previous_message_dark.png | Bin .../ic_action_previous_message_light.png | Bin .../drawable-xhdpi/ic_action_refresh_dark.png | Bin .../ic_action_refresh_light.png | Bin .../ic_action_remote_search_dark.png | Bin .../ic_action_remote_search_light.png | Bin .../ic_action_request_read_receipt_dark.png | Bin .../ic_action_request_read_receipt_light.png | Bin .../drawable-xhdpi/ic_action_save_dark.png | Bin .../drawable-xhdpi/ic_action_save_light.png | Bin .../drawable-xhdpi/ic_action_search_dark.png | Bin .../drawable-xhdpi/ic_action_search_light.png | Bin .../ic_action_select_all_dark.png | Bin .../ic_action_select_all_light.png | Bin .../drawable-xhdpi/ic_action_send_dark.png | Bin .../drawable-xhdpi/ic_action_send_light.png | Bin .../ic_action_settings_dark.png | Bin .../ic_action_settings_light.png | Bin .../ic_action_single_message_options_dark.png | Bin ...ic_action_single_message_options_light.png | Bin .../drawable-xhdpi/ic_action_sort_dark.png | Bin .../drawable-xhdpi/ic_action_sort_light.png | Bin .../drawable-xhdpi/ic_action_spam_dark.png | Bin .../drawable-xhdpi/ic_action_spam_light.png | Bin .../drawable-xhdpi/ic_action_unflag_dark.png | Bin .../drawable-xhdpi/ic_action_unflag_light.png | Bin .../drawable-xhdpi/ic_action_upload_dark.png | Bin .../drawable-xhdpi/ic_action_upload_light.png | Bin .../ic_button_add_contact_dark.png | Bin .../ic_button_add_contact_light.png | Bin .../drawable-xhdpi/ic_contact_picture.png | Bin .../ic_notify_check_mail_anim_0.png | Bin .../ic_notify_check_mail_anim_1.png | Bin .../ic_notify_check_mail_anim_2.png | Bin .../ic_notify_check_mail_anim_3.png | Bin .../ic_notify_check_mail_anim_4.png | Bin .../ic_notify_check_mail_anim_5.png | Bin .../drawable-xhdpi/ic_notify_new_mail.png | Bin .../res}/drawable-xhdpi/ic_unread_widget.png | Bin .../ic_unread_widget_selected.png | Bin .../src/main/res}/drawable-xhdpi/icon.png | Bin .../res}/drawable-xhdpi/item_focused.9.png | Bin .../res}/drawable-xhdpi/item_pressed.9.png | Bin .../ic_action_collapse_dark.png | Bin .../ic_action_collapse_light.png | Bin .../drawable-xxhdpi/ic_action_expand_dark.png | Bin .../ic_action_expand_light.png | Bin .../src/main/res}/drawable-xxhdpi/icon.png | Bin .../src/main/res}/drawable-xxxhdpi/icon.png | Bin .../drawable/btn_check_message_list_dark.xml | 0 .../drawable/btn_check_message_list_light.xml | 0 .../src/main/res}/drawable/btn_dialog.xml | 0 .../src/main/res}/drawable/btn_edit.xml | 0 .../res}/drawable/ic_notify_check_mail.xml | 0 .../message_list_item_footer_background.xml | 0 .../main/res}/drawable/rounded_corners.xml | 0 .../drawable/selectable_item_background.xml | 0 .../res}/drawable/thread_count_box_dark.xml | 0 .../res}/drawable/thread_count_box_light.xml | 0 .../res}/drawable/unread_count_background.xml | 0 .../drawable/unread_widget_background.xml | 0 .../main/res}/drawable/unread_widget_icon.xml | 0 .../res}/layout-land/actionbar_custom.xml | 0 .../res}/layout/accessible_email_content.xml | 0 .../src/main/res}/layout/account_list.xml | 0 .../layout/account_setup_account_type.xml | 0 .../main/res}/layout/account_setup_basics.xml | 0 .../layout/account_setup_check_settings.xml | 0 .../res}/layout/account_setup_composition.xml | 0 .../res}/layout/account_setup_incoming.xml | 0 .../main/res}/layout/account_setup_names.xml | 0 .../res}/layout/account_setup_options.xml | 0 .../res}/layout/account_setup_outgoing.xml | 0 .../src/main/res}/layout/accounts.xml | 0 .../res}/layout/accounts_folders_icons.xml | 0 .../src/main/res}/layout/accounts_item.xml | 0 .../res}/layout/accounts_password_prompt.xml | 0 .../src/main/res}/layout/actionbar_custom.xml | 0 ...nbar_indeterminate_progress_actionview.xml | 0 .../main/res}/layout/choose_account_item.xml | 0 .../main/res}/layout/choose_identity_item.xml | 0 .../layout/client_certificate_spinner.xml | 0 .../main/res}/layout/color_picker_dialog.xml | 0 .../src/main/res}/layout/edit_identity.xml | 0 .../main/res}/layout/email_address_list.xml | 0 .../res}/layout/email_address_list_item.xml | 0 .../main/res}/layout/empty_message_view.xml | 0 .../res}/layout/foldable_linearlayout.xml | 0 .../src/main/res}/layout/folder_list.xml | 0 .../src/main/res}/layout/folder_list_item.xml | 0 .../main/res}/layout/list_content_simple.xml | 0 .../src/main/res}/layout/message.xml | 0 .../src/main/res}/layout/message_compose.xml | 0 .../layout/message_compose_attachment.xml | 0 .../src/main/res}/layout/message_list.xml | 0 .../res}/layout/message_list_fragment.xml | 0 .../main/res}/layout/message_list_item.xml | 0 .../res}/layout/message_list_item_footer.xml | 0 .../main/res}/layout/message_list_loading.xml | 0 .../res}/layout/message_view_attachment.xml | 0 .../main/res}/layout/message_view_header.xml | 0 .../layout/message_view_openpgp_layout.xml | 0 .../res}/layout/recipient_dropdown_item.xml | 0 .../res}/layout/slider_preference_dialog.xml | 0 .../main/res}/layout/split_message_list.xml | 0 .../main/res}/layout/unread_widget_layout.xml | 0 .../main/res}/layout/upgrade_databases.xml | 0 .../src/main/res}/layout/welcome_message.xml | 0 .../src/main/res}/layout/wizard_cancel.xml | 0 .../src/main/res}/layout/wizard_done.xml | 0 .../src/main/res}/layout/wizard_next.xml | 0 .../src/main/res}/layout/wizard_setup.xml | 0 .../src/main/res}/layout/wizard_welcome.xml | 0 .../src/main/res}/menu/accounts_context.xml | 0 .../src/main/res}/menu/accounts_option.xml | 0 .../res}/menu/disabled_accounts_context.xml | 0 .../src/main/res}/menu/folder_context.xml | 0 .../src/main/res}/menu/folder_list_option.xml | 0 .../main/res}/menu/folder_select_option.xml | 0 .../res}/menu/manage_identities_context.xml | 0 .../res}/menu/manage_identities_option.xml | 0 .../main/res}/menu/message_compose_option.xml | 0 .../main/res}/menu/message_list_context.xml | 0 .../res}/menu/message_list_item_context.xml | 0 .../main/res}/menu/message_list_option.xml | 0 .../src/main/res}/values-ca/strings.xml | 0 .../src/main/res}/values-cs/strings.xml | 0 .../src/main/res}/values-da/strings.xml | 0 .../src/main/res}/values-de/strings.xml | 0 .../src/main/res}/values-el/strings.xml | 0 .../src/main/res}/values-es/strings.xml | 0 .../src/main/res}/values-et/strings.xml | 0 .../src/main/res}/values-eu/strings.xml | 0 .../src/main/res}/values-fi/strings.xml | 0 .../src/main/res}/values-fr/strings.xml | 0 .../src/main/res}/values-gl-rES/strings.xml | 0 .../src/main/res}/values-gl/strings.xml | 0 .../src/main/res}/values-hr/strings.xml | 0 .../src/main/res}/values-hu/strings.xml | 0 .../src/main/res}/values-it/strings.xml | 0 .../src/main/res}/values-iw/strings.xml | 0 .../src/main/res}/values-ja/strings.xml | 0 .../src/main/res}/values-ko/strings.xml | 0 .../src/main/res}/values-land/styles.xml | 0 .../src/main/res}/values-lt/strings.xml | 0 .../src/main/res}/values-lv/strings.xml | 0 .../src/main/res}/values-nb/strings.xml | 0 .../src/main/res}/values-nl/strings.xml | 0 .../src/main/res}/values-pl/strings.xml | 0 .../src/main/res}/values-pt-rBR/strings.xml | 0 .../src/main/res}/values-ru/strings.xml | 0 .../src/main/res}/values-sk/strings.xml | 0 .../src/main/res}/values-sv/strings.xml | 0 .../main/res}/values-sw600dp-land/styles.xml | 0 .../main/res}/values-sw600dp-port/styles.xml | 0 .../src/main/res}/values-tr/strings.xml | 0 .../src/main/res}/values-uk/strings.xml | 0 .../src/main/res}/values-v21/styles.xml | 0 .../src/main/res}/values-zh-rCN/strings.xml | 0 .../res}/values-zh-rTW/plugin_strings.xml | 0 .../src/main/res}/values-zh-rTW/strings.xml | 0 .../src/main/res}/values/arrays.xml | 0 {res => k9mail/src/main/res}/values/attrs.xml | 0 .../src/main/res}/values/colors.xml | 0 .../src/main/res}/values/constants.xml | 0 .../src/main/res}/values/dimensions.xml | 0 {res => k9mail/src/main/res}/values/ids.xml | 0 .../src/main/res}/values/strings.xml | 0 .../src/main/res}/values/styles.xml | 0 .../src/main/res}/values/themes.xml | 0 .../src/main/res}/xml-ja/changelog.xml | 0 .../res}/xml/account_settings_preferences.xml | 0 .../src/main/res}/xml/changelog_master.xml | 0 .../res}/xml/folder_settings_preferences.xml | 0 .../src/main/res}/xml/font_preferences.xml | 0 .../src/main/res}/xml/global_preferences.xml | 0 .../src/main/res}/xml/providers.xml | 0 .../src/main/res}/xml/searchable.xml | 0 .../src/main/res}/xml/unread_widget_info.xml | 0 settings.gradle | 1 + tests-on-jvm/build.gradle | 12 +- tests/proguard.cfg | 40 ------ 952 files changed, 112 insertions(+), 170 deletions(-) create mode 100644 k9mail/build.gradle rename {tests => k9mail/src/androidTest}/AndroidManifest.xml (100%) rename {tests/src => k9mail/src/androidTest/java}/com/fsck/k9/activity/AccountsTest.java (100%) rename {tests/src => k9mail/src/androidTest/java}/com/fsck/k9/activity/MessageReferenceTest.java (100%) rename {tests/src => k9mail/src/androidTest/java}/com/fsck/k9/helper/FileHelperTest.java (100%) rename {tests/src => k9mail/src/androidTest/java}/com/fsck/k9/helper/HtmlConverterTest.java (100%) rename {tests/src => k9mail/src/androidTest/java}/com/fsck/k9/helper/MessageHelperTest.java (100%) rename {tests/src => k9mail/src/androidTest/java}/com/fsck/k9/mail/MessageTest.java (100%) rename {tests/src => k9mail/src/androidTest/java}/com/fsck/k9/mail/ssl/TrustManagerFactoryTest.java (100%) rename {tests/src => k9mail/src/androidTest/java}/com/fsck/k9/mailstore/LocalMessageExtractorTest.java (100%) rename AndroidManifest.xml => k9mail/src/main/AndroidManifest.xml (100%) rename {assets => k9mail/src/main/assets}/downloading.html (100%) rename {assets => k9mail/src/main/assets}/emoticons/24hours.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/airplane.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/angry.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/annoy.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/apple.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/appli01.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/appli02.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/aquarius.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/aries.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/art.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/atm.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/bag.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/ban.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/banana.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/bank.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/bar.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/baseball.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/basketball.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/bearing.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/beer.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/bell.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/bicycle.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/birthday.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/bleah.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/bomb.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/book.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/bottle.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/boutique.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/bread.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/bud.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/building.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/bullettrain.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/bus.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/by-d.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/cafe.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/cake.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/camera.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/cancer.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/capricornus.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/car.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/carouselpony.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/cat.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/catface.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/cd.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/chair.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/cherry.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/cherryblossom.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/chick.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/clear.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/clip.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/clock.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/cloud.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/clover.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/club.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/coldsweats01.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/coldsweats02.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/confident.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/copyright.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/crown.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/crying.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/cute.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/d-point.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/danger.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/dash.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/delicious.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/denim.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/despair.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/diamond.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/dog.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/dollar.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/door.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/down.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/downwardleft.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/downwardright.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/drama.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/ear.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/eight.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/empty.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/end.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/enter.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/event.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/eye.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/eyeglass.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/fastfood.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/faxto.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/fish.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/five.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/flag.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/flair.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/foot.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/four.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/free.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/freedial.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/fuji.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/full.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/fullmoon.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/game.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/gasstation.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/gawk.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/gemini.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/golf.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/good.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/hairsalon.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/happy01.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/happy02.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/heart.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/heart01.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/heart02.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/heart03.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/heart04.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/horse.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/hospital.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/hotel.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/house.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/id.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/impact.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/info01.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/info02.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/japanesetea.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/karaoke.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/key.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/kissmark.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/leftright.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/leo.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/libra.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/loveletter.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/lovely.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/mail.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/mailto.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/maple.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/memo.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/mist.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/mobaq.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/mobilephone.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/moneybag.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/moon1.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/moon2.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/moon3.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/motorsports.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/movie.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/music.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/new.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/newmoon.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/ng.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/night.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/nine.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/noodle.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/nosmoking.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/note.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/notes.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/ok.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/on.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/one.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/paper.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/parking.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/pass.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/pc.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/pen.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/pencil.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/penguin.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/phoneto.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/pig.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/pisces.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/pocketbell.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/postoffice.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/pouch.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/pout.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/present.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/punch.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/r-mark.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/rain.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/recycle.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/restaurant.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/ribbon.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/riceball.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/ring.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/rock.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/rouge.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/run.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/rvcar.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/sad.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/sagittarius.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/sandclock.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/school.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/scissors.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/scorpius.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/search.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/secret.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/seven.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/shadow.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/sharp.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/shine.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/ship.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/shock.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/shoe.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/sign01.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/sign02.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/sign03.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/sign04.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/sign05.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/signaler.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/six.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/ski.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/slate.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/sleepy.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/smile.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/smoking.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/snail.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/snow.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/snowboard.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/soccer.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/soon.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/spa.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/spade.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/sports.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/sprinkle.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/subway.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/sun.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/sweat01.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/sweat02.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/t-shirt.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/taurus.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/telephone.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/tennis.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/think.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/three.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/thunder.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/ticket.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/tm.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/toilet.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/train.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/tulip.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/tv.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/two.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/typhoon.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/up.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/updown.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/upwardleft.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/upwardright.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/virgo.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/watch.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/wave.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/weep.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/wheelchair.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/wine.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/wink.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/wobbly.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/wrench.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/xmas.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/yacht.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/yen.gif (100%) rename {assets => k9mail/src/main/assets}/emoticons/zero.gif (100%) rename {assets => k9mail/src/main/assets}/icon.png (100%) rename {assets => k9mail/src/main/assets}/loading.gif (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/Account.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/AccountStats.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/BaseAccount.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/Clock.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/EmailAddressAdapter.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/EmailAddressValidator.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/FontSizes.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/Identity.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/K9.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/NotificationSetting.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/PRNGFixes.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/Preferences.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/Throttle.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/activity/AccountList.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/activity/Accounts.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/activity/ActivityListener.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/activity/ChooseFolder.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/activity/ChooseIdentity.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/activity/ColorPickerDialog.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/activity/ConfirmationDialog.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/activity/EditIdentity.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/activity/EmailAddressList.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/activity/FolderInfoHolder.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/activity/FolderList.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/activity/FolderListFilter.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/activity/InsertableHtmlContent.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/activity/K9Activity.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/activity/K9ActivityCommon.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/activity/K9ListActivity.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/activity/K9PreferenceActivity.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/activity/LauncherShortcuts.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/activity/ManageIdentities.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/activity/MessageCompose.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/activity/MessageInfoHolder.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/activity/MessageList.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/activity/MessageReference.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/activity/NotificationDeleteConfirmation.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/activity/Search.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/activity/TextBodyBuilder.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/activity/UnreadWidgetConfiguration.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/activity/UpgradeDatabases.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/activity/loader/AttachmentContentLoader.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/activity/loader/AttachmentInfoLoader.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/activity/misc/Attachment.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/activity/misc/ContactPictureLoader.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/activity/misc/ExtendedAsyncTask.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/activity/misc/NonConfigurationInstance.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/activity/misc/SwipeGestureDetector.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/activity/setup/AccountSettings.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/activity/setup/AccountSetupAccountType.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/activity/setup/AccountSetupBasics.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/activity/setup/AccountSetupCheckSettings.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/activity/setup/AccountSetupComposition.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/activity/setup/AccountSetupIncoming.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/activity/setup/AccountSetupNames.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/activity/setup/AccountSetupOptions.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/activity/setup/AccountSetupOutgoing.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/activity/setup/AuthTypeAdapter.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/activity/setup/AuthTypeHolder.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/activity/setup/ConnectionSecurityAdapter.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/activity/setup/ConnectionSecurityHolder.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/activity/setup/FolderSettings.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/activity/setup/FontSizeSettings.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/activity/setup/Prefs.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/activity/setup/SliderPreference.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/activity/setup/SpinnerOption.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/activity/setup/WelcomeMessage.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/cache/EmailProviderCache.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/cache/EmailProviderCacheCursor.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/cache/TemporaryAttachmentStore.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/controller/MessagingController.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/controller/MessagingControllerPushReceiver.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/controller/MessagingListener.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/controller/UnavailableAccountException.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/crypto/CryptoHelper.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/crypto/OpenPgpApiHelper.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/crypto/PgpData.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/fragment/ConfirmationDialogFragment.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/fragment/MessageListFragment.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/fragment/MessageViewFragment.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/fragment/ProgressDialogFragment.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/helper/ClipboardManager.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/helper/ContactItem.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/helper/ContactPicture.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/helper/Contacts.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/helper/FileBrowserHelper.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/helper/FileHelper.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/helper/HtmlConverter.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/helper/IdentityHelper.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/helper/MediaScannerNotifier.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/helper/MergeCursor.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/helper/MergeCursorWithUniqueId.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/helper/MessageHelper.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/helper/SizeFormatter.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/helper/UrlEncodingHelper.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/helper/Utility.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/helper/power/TracingPowerManager.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/mail/Address.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/mail/AuthType.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/mail/Authentication.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/mail/AuthenticationFailedException.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/mail/Body.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/mail/BodyPart.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/mail/CertificateChainException.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/mail/CertificateValidationException.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/mail/CompositeBody.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/mail/ConnectionSecurity.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/mail/FetchProfile.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/mail/Flag.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/mail/Folder.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/mail/K9MailLib.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/mail/Message.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/mail/MessageRetrievalListener.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/mail/MessagingException.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/mail/Multipart.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/mail/Part.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/mail/PushReceiver.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/mail/Pusher.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/mail/ServerSettings.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/mail/Store.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/mail/Transport.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/mail/filter/Base64.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/mail/filter/Base64OutputStream.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/mail/filter/CountingOutputStream.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/mail/filter/EOLConvertingOutputStream.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/mail/filter/FixedLengthInputStream.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/mail/filter/Hex.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/mail/filter/LineWrapOutputStream.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/mail/filter/PeekableInputStream.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/mail/filter/SmtpDataStuffing.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/mail/internet/BinaryTempFileBody.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/mail/internet/BinaryTempFileMessageBody.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/mail/internet/CharsetSupport.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/mail/internet/DecoderUtil.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/mail/internet/EncoderUtil.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/mail/internet/Iso2022JpToShiftJisInputStream.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/mail/internet/JisSupport.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/mail/internet/MessageExtractor.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/mail/internet/MimeBodyPart.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/mail/internet/MimeHeader.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/mail/internet/MimeMessage.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/mail/internet/MimeMultipart.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/mail/internet/MimeUtility.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/mail/internet/TextBody.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/mail/internet/Viewable.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/mail/ssl/DefaultTrustedSocketFactory.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/mail/ssl/KeyChainKeyManager.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/mail/ssl/LocalKeyStore.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/mail/ssl/TrustManagerFactory.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/mail/ssl/TrustedSocketFactory.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/mail/store/RemoteStore.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/mail/store/StoreConfig.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/mail/store/imap/ImapCommands.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/mail/store/imap/ImapConnection.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/mail/store/imap/ImapException.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/mail/store/imap/ImapList.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/mail/store/imap/ImapResponse.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/mail/store/imap/ImapResponseCallback.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/mail/store/imap/ImapResponseParser.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/mail/store/imap/ImapStore.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/mail/store/imap/ImapUtility.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/mail/store/imap/UntaggedHandler.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/mail/store/pop3/Pop3Store.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/mail/store/webdav/WebDavSocketFactory.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/mail/store/webdav/WebDavStore.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/mail/transport/SmtpTransport.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/mail/transport/WebDavTransport.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/mail/transport/imap/ImapSettings.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/mailstore/AttachmentMessageBodyUtil.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/mailstore/BinaryAttachmentBody.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/mailstore/LocalAttachmentBody.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/mailstore/LocalAttachmentBodyPart.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/mailstore/LocalAttachmentMessageBody.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/mailstore/LocalFolder.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/mailstore/LocalMessage.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/mailstore/LocalMessageExtractor.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/mailstore/LocalStore.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/mailstore/LocalTextBody.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/mailstore/LockableDatabase.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/mailstore/MessageRemovalListener.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/mailstore/StorageManager.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/mailstore/StoreSchemaDefinition.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/mailstore/TempFileBody.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/mailstore/TempFileMessageBody.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/mailstore/ThreadInfo.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/mailstore/UnavailableStorageException.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/mailstore/ViewableContainer.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/preferences/AccountSettings.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/preferences/CheckBoxListPreference.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/preferences/Editor.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/preferences/FolderSettings.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/preferences/GlobalSettings.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/preferences/IdentitySettings.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/preferences/Settings.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/preferences/SettingsExporter.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/preferences/SettingsImportExportException.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/preferences/SettingsImporter.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/preferences/Storage.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/preferences/TimePickerPreference.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/provider/AttachmentProvider.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/provider/EmailProvider.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/provider/MessageProvider.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/provider/UnreadWidgetProvider.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/remotecontrol/AccountReceiver.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/remotecontrol/K9AccountReceptor.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/remotecontrol/K9RemoteControl.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/search/ConditionsTreeNode.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/search/LocalSearch.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/search/SearchAccount.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/search/SearchSpecification.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/search/SqlQueryBuilder.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/service/BootReceiver.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/service/CoreReceiver.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/service/CoreService.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/service/DatabaseUpgradeService.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/service/MailService.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/service/NotificationActionService.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/service/PollService.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/service/PushService.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/service/RemoteControlReceiver.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/service/RemoteControlService.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/service/ShutdownReceiver.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/service/SleepService.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/service/StorageGoneReceiver.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/service/StorageReceiver.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/view/AttachmentView.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/view/ClientCertificateSpinner.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/view/ColorChip.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/view/FoldableLinearLayout.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/view/K9PullToRefreshListView.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/view/MessageHeader.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/view/MessageOpenPgpView.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/view/MessageTitleView.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/view/MessageWebView.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/view/NonLockingScrollView.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/view/RigidWebView.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/view/SingleMessageView.java (100%) rename {src => k9mail/src/main/java}/com/fsck/k9/view/ViewSwitcher.java (100%) rename {res => k9mail/src/main/res}/anim/slide_in_left.xml (100%) rename {res => k9mail/src/main/res}/anim/slide_in_right.xml (100%) rename {res => k9mail/src/main/res}/anim/slide_out_left.xml (100%) rename {res => k9mail/src/main/res}/anim/slide_out_right.xml (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/action_search_folder_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/action_search_folder_light.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/attached_image_placeholder.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/attachment_text_box_dark.9.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/attachment_text_box_light.9.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/btn_check_off_normal_holo_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/btn_check_off_normal_holo_light.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/btn_check_on_normal_holo_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/btn_check_on_normal_holo_light.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/btn_dialog_disable.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/btn_dialog_normal.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/btn_dialog_pressed.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/btn_dialog_selected.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/btn_edit_disable.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/btn_edit_normal.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/btn_edit_pressed.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/btn_edit_selected.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/divider_horizontal_email.9.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/dropdown_ic_arrow_normal_holo_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/dropdown_ic_arrow_normal_holo_light.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/folder_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/folder_light.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/ic_action_about_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/ic_action_about_light.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/ic_action_add_attachment_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/ic_action_add_attachment_light.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/ic_action_add_cc_bbc_light.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/ic_action_add_cc_bcc_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/ic_action_add_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/ic_action_add_light.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/ic_action_archive_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/ic_action_archive_light.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/ic_action_cancel_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/ic_action_cancel_light.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/ic_action_collapse_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/ic_action_collapse_light.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/ic_action_compose_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/ic_action_compose_light.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/ic_action_copy_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/ic_action_copy_light.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/ic_action_delete_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/ic_action_delete_light.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/ic_action_expand_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/ic_action_expand_light.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/ic_action_flag_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/ic_action_flag_light.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/ic_action_import_export_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/ic_action_import_export_light.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/ic_action_mark_as_read_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/ic_action_mark_as_read_light.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/ic_action_mark_as_unread_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/ic_action_mark_as_unread_light.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/ic_action_move_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/ic_action_move_light.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/ic_action_next_message_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/ic_action_next_message_light.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/ic_action_previous_message_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/ic_action_previous_message_light.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/ic_action_refresh_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/ic_action_refresh_light.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/ic_action_remote_search_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/ic_action_remote_search_light.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/ic_action_request_read_receipt_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/ic_action_request_read_receipt_light.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/ic_action_save_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/ic_action_save_light.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/ic_action_search_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/ic_action_search_light.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/ic_action_select_all_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/ic_action_select_all_light.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/ic_action_send_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/ic_action_send_light.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/ic_action_settings_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/ic_action_settings_light.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/ic_action_single_message_options_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/ic_action_single_message_options_light.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/ic_action_sort_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/ic_action_sort_light.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/ic_action_spam_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/ic_action_spam_light.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/ic_action_unflag_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/ic_action_unflag_light.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/ic_action_upload_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/ic_action_upload_light.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/ic_button_add_contact_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/ic_button_add_contact_light.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/ic_contact_picture.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/ic_delete.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/ic_email_answered_small.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/ic_email_attachment.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/ic_email_attachment_small.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/ic_email_forwarded_small.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/ic_notify_check_mail_anim_0.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/ic_notify_check_mail_anim_1.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/ic_notify_check_mail_anim_2.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/ic_notify_check_mail_anim_3.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/ic_notify_check_mail_anim_4.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/ic_notify_check_mail_anim_5.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/ic_notify_new_mail.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/ic_unread_widget.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/ic_unread_widget_selected.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/icon.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/overlay_error.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/overlay_ok.png (100%) rename {res => k9mail/src/main/res}/drawable-hdpi/preview_unread_widget.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/action_search_folder_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/action_search_folder_light.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/attached_image_placeholder.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/attachment_text_box_dark.9.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/attachment_text_box_light.9.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/btn_check_off_normal_holo_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/btn_check_off_normal_holo_light.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/btn_check_on_normal_holo_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/btn_check_on_normal_holo_light.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/btn_dialog_disable.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/btn_dialog_normal.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/btn_dialog_pressed.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/btn_dialog_selected.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/btn_edit_disable.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/btn_edit_normal.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/btn_edit_pressed.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/btn_edit_selected.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/divider_horizontal_email.9.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/dropdown_ic_arrow_normal_holo_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/dropdown_ic_arrow_normal_holo_light.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/folder_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/folder_light.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/ic_action_about_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/ic_action_about_light.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/ic_action_add_attachment_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/ic_action_add_attachment_light.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/ic_action_add_cc_bbc_light.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/ic_action_add_cc_bcc_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/ic_action_add_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/ic_action_add_light.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/ic_action_archive_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/ic_action_archive_light.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/ic_action_cancel_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/ic_action_cancel_light.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/ic_action_collapse_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/ic_action_collapse_light.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/ic_action_compose_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/ic_action_compose_light.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/ic_action_copy_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/ic_action_copy_light.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/ic_action_delete_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/ic_action_delete_light.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/ic_action_expand_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/ic_action_expand_light.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/ic_action_flag_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/ic_action_flag_light.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/ic_action_import_export_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/ic_action_import_export_light.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/ic_action_mark_as_read_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/ic_action_mark_as_read_light.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/ic_action_mark_as_unread_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/ic_action_mark_as_unread_light.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/ic_action_move_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/ic_action_move_light.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/ic_action_next_message_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/ic_action_next_message_light.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/ic_action_previous_message_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/ic_action_previous_message_light.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/ic_action_refresh_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/ic_action_refresh_light.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/ic_action_remote_search_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/ic_action_remote_search_light.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/ic_action_request_read_receipt_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/ic_action_request_read_receipt_light.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/ic_action_save_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/ic_action_save_light.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/ic_action_search_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/ic_action_search_light.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/ic_action_select_all_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/ic_action_select_all_light.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/ic_action_send_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/ic_action_send_light.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/ic_action_settings_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/ic_action_settings_light.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/ic_action_single_message_options_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/ic_action_single_message_options_light.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/ic_action_sort_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/ic_action_sort_light.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/ic_action_spam_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/ic_action_spam_light.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/ic_action_unflag_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/ic_action_unflag_light.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/ic_action_upload_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/ic_action_upload_light.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/ic_button_add_contact_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/ic_button_add_contact_light.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/ic_contact_picture.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/ic_delete.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/ic_email_answered_small.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/ic_email_attachment.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/ic_email_attachment_small.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/ic_email_forwarded_answered_small.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/ic_email_forwarded_small.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/ic_notify_check_mail_anim_0.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/ic_notify_check_mail_anim_1.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/ic_notify_check_mail_anim_2.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/ic_notify_check_mail_anim_3.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/ic_notify_check_mail_anim_4.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/ic_notify_check_mail_anim_5.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/ic_notify_new_mail.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/ic_unread_widget.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/ic_unread_widget_selected.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/icon.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/overlay_error.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/overlay_ok.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/panel_separator.9.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/popup_background.9.png (100%) rename {res => k9mail/src/main/res}/drawable-mdpi/signed_large.png (100%) rename {res => k9mail/src/main/res}/drawable-nodpi-v21/ic_action_delete_dark_vector.xml (100%) rename {res => k9mail/src/main/res}/drawable-nodpi-v21/ic_action_mark_as_read_dark_vector.xml (100%) rename {res => k9mail/src/main/res}/drawable-nodpi-v21/ic_action_single_message_options_dark_vector.xml (100%) rename {res => k9mail/src/main/res}/drawable-nodpi-v21/ic_notify_new_mail_vector.xml (100%) rename {res => k9mail/src/main/res}/drawable-xhdpi/action_search_folder_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-xhdpi/action_search_folder_light.png (100%) rename {res => k9mail/src/main/res}/drawable-xhdpi/btn_check_off_normal_holo_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-xhdpi/btn_check_off_normal_holo_light.png (100%) rename {res => k9mail/src/main/res}/drawable-xhdpi/btn_check_on_normal_holo_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-xhdpi/btn_check_on_normal_holo_light.png (100%) rename {res => k9mail/src/main/res}/drawable-xhdpi/dropdown_ic_arrow_normal_holo_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-xhdpi/dropdown_ic_arrow_normal_holo_light.png (100%) rename {res => k9mail/src/main/res}/drawable-xhdpi/folder_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-xhdpi/folder_light.png (100%) rename {res => k9mail/src/main/res}/drawable-xhdpi/ic_action_about_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-xhdpi/ic_action_about_light.png (100%) rename {res => k9mail/src/main/res}/drawable-xhdpi/ic_action_add_attachment_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-xhdpi/ic_action_add_attachment_light.png (100%) rename {res => k9mail/src/main/res}/drawable-xhdpi/ic_action_add_cc_bbc_light.png (100%) rename {res => k9mail/src/main/res}/drawable-xhdpi/ic_action_add_cc_bcc_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-xhdpi/ic_action_add_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-xhdpi/ic_action_add_light.png (100%) rename {res => k9mail/src/main/res}/drawable-xhdpi/ic_action_archive_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-xhdpi/ic_action_archive_light.png (100%) rename {res => k9mail/src/main/res}/drawable-xhdpi/ic_action_cancel_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-xhdpi/ic_action_cancel_light.png (100%) rename {res => k9mail/src/main/res}/drawable-xhdpi/ic_action_collapse_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-xhdpi/ic_action_collapse_light.png (100%) rename {res => k9mail/src/main/res}/drawable-xhdpi/ic_action_compose_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-xhdpi/ic_action_compose_light.png (100%) rename {res => k9mail/src/main/res}/drawable-xhdpi/ic_action_copy_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-xhdpi/ic_action_copy_light.png (100%) rename {res => k9mail/src/main/res}/drawable-xhdpi/ic_action_delete_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-xhdpi/ic_action_delete_light.png (100%) rename {res => k9mail/src/main/res}/drawable-xhdpi/ic_action_expand_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-xhdpi/ic_action_expand_light.png (100%) rename {res => k9mail/src/main/res}/drawable-xhdpi/ic_action_flag_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-xhdpi/ic_action_flag_light.png (100%) rename {res => k9mail/src/main/res}/drawable-xhdpi/ic_action_import_export_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-xhdpi/ic_action_import_export_light.png (100%) rename {res => k9mail/src/main/res}/drawable-xhdpi/ic_action_mark_as_read_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-xhdpi/ic_action_mark_as_read_light.png (100%) rename {res => k9mail/src/main/res}/drawable-xhdpi/ic_action_mark_as_unread_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-xhdpi/ic_action_mark_as_unread_light.png (100%) rename {res => k9mail/src/main/res}/drawable-xhdpi/ic_action_move_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-xhdpi/ic_action_move_light.png (100%) rename {res => k9mail/src/main/res}/drawable-xhdpi/ic_action_next_message_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-xhdpi/ic_action_next_message_light.png (100%) rename {res => k9mail/src/main/res}/drawable-xhdpi/ic_action_previous_message_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-xhdpi/ic_action_previous_message_light.png (100%) rename {res => k9mail/src/main/res}/drawable-xhdpi/ic_action_refresh_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-xhdpi/ic_action_refresh_light.png (100%) rename {res => k9mail/src/main/res}/drawable-xhdpi/ic_action_remote_search_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-xhdpi/ic_action_remote_search_light.png (100%) rename {res => k9mail/src/main/res}/drawable-xhdpi/ic_action_request_read_receipt_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-xhdpi/ic_action_request_read_receipt_light.png (100%) rename {res => k9mail/src/main/res}/drawable-xhdpi/ic_action_save_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-xhdpi/ic_action_save_light.png (100%) rename {res => k9mail/src/main/res}/drawable-xhdpi/ic_action_search_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-xhdpi/ic_action_search_light.png (100%) rename {res => k9mail/src/main/res}/drawable-xhdpi/ic_action_select_all_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-xhdpi/ic_action_select_all_light.png (100%) rename {res => k9mail/src/main/res}/drawable-xhdpi/ic_action_send_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-xhdpi/ic_action_send_light.png (100%) rename {res => k9mail/src/main/res}/drawable-xhdpi/ic_action_settings_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-xhdpi/ic_action_settings_light.png (100%) rename {res => k9mail/src/main/res}/drawable-xhdpi/ic_action_single_message_options_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-xhdpi/ic_action_single_message_options_light.png (100%) rename {res => k9mail/src/main/res}/drawable-xhdpi/ic_action_sort_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-xhdpi/ic_action_sort_light.png (100%) rename {res => k9mail/src/main/res}/drawable-xhdpi/ic_action_spam_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-xhdpi/ic_action_spam_light.png (100%) rename {res => k9mail/src/main/res}/drawable-xhdpi/ic_action_unflag_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-xhdpi/ic_action_unflag_light.png (100%) rename {res => k9mail/src/main/res}/drawable-xhdpi/ic_action_upload_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-xhdpi/ic_action_upload_light.png (100%) rename {res => k9mail/src/main/res}/drawable-xhdpi/ic_button_add_contact_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-xhdpi/ic_button_add_contact_light.png (100%) rename {res => k9mail/src/main/res}/drawable-xhdpi/ic_contact_picture.png (100%) rename {res => k9mail/src/main/res}/drawable-xhdpi/ic_notify_check_mail_anim_0.png (100%) rename {res => k9mail/src/main/res}/drawable-xhdpi/ic_notify_check_mail_anim_1.png (100%) rename {res => k9mail/src/main/res}/drawable-xhdpi/ic_notify_check_mail_anim_2.png (100%) rename {res => k9mail/src/main/res}/drawable-xhdpi/ic_notify_check_mail_anim_3.png (100%) rename {res => k9mail/src/main/res}/drawable-xhdpi/ic_notify_check_mail_anim_4.png (100%) rename {res => k9mail/src/main/res}/drawable-xhdpi/ic_notify_check_mail_anim_5.png (100%) rename {res => k9mail/src/main/res}/drawable-xhdpi/ic_notify_new_mail.png (100%) rename {res => k9mail/src/main/res}/drawable-xhdpi/ic_unread_widget.png (100%) rename {res => k9mail/src/main/res}/drawable-xhdpi/ic_unread_widget_selected.png (100%) rename {res => k9mail/src/main/res}/drawable-xhdpi/icon.png (100%) rename {res => k9mail/src/main/res}/drawable-xhdpi/item_focused.9.png (100%) rename {res => k9mail/src/main/res}/drawable-xhdpi/item_pressed.9.png (100%) rename {res => k9mail/src/main/res}/drawable-xxhdpi/ic_action_collapse_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-xxhdpi/ic_action_collapse_light.png (100%) rename {res => k9mail/src/main/res}/drawable-xxhdpi/ic_action_expand_dark.png (100%) rename {res => k9mail/src/main/res}/drawable-xxhdpi/ic_action_expand_light.png (100%) rename {res => k9mail/src/main/res}/drawable-xxhdpi/icon.png (100%) rename {res => k9mail/src/main/res}/drawable-xxxhdpi/icon.png (100%) rename {res => k9mail/src/main/res}/drawable/btn_check_message_list_dark.xml (100%) rename {res => k9mail/src/main/res}/drawable/btn_check_message_list_light.xml (100%) rename {res => k9mail/src/main/res}/drawable/btn_dialog.xml (100%) rename {res => k9mail/src/main/res}/drawable/btn_edit.xml (100%) rename {res => k9mail/src/main/res}/drawable/ic_notify_check_mail.xml (100%) rename {res => k9mail/src/main/res}/drawable/message_list_item_footer_background.xml (100%) rename {res => k9mail/src/main/res}/drawable/rounded_corners.xml (100%) rename {res => k9mail/src/main/res}/drawable/selectable_item_background.xml (100%) rename {res => k9mail/src/main/res}/drawable/thread_count_box_dark.xml (100%) rename {res => k9mail/src/main/res}/drawable/thread_count_box_light.xml (100%) rename {res => k9mail/src/main/res}/drawable/unread_count_background.xml (100%) rename {res => k9mail/src/main/res}/drawable/unread_widget_background.xml (100%) rename {res => k9mail/src/main/res}/drawable/unread_widget_icon.xml (100%) rename {res => k9mail/src/main/res}/layout-land/actionbar_custom.xml (100%) rename {res => k9mail/src/main/res}/layout/accessible_email_content.xml (100%) rename {res => k9mail/src/main/res}/layout/account_list.xml (100%) rename {res => k9mail/src/main/res}/layout/account_setup_account_type.xml (100%) rename {res => k9mail/src/main/res}/layout/account_setup_basics.xml (100%) rename {res => k9mail/src/main/res}/layout/account_setup_check_settings.xml (100%) rename {res => k9mail/src/main/res}/layout/account_setup_composition.xml (100%) rename {res => k9mail/src/main/res}/layout/account_setup_incoming.xml (100%) rename {res => k9mail/src/main/res}/layout/account_setup_names.xml (100%) rename {res => k9mail/src/main/res}/layout/account_setup_options.xml (100%) rename {res => k9mail/src/main/res}/layout/account_setup_outgoing.xml (100%) rename {res => k9mail/src/main/res}/layout/accounts.xml (100%) rename {res => k9mail/src/main/res}/layout/accounts_folders_icons.xml (100%) rename {res => k9mail/src/main/res}/layout/accounts_item.xml (100%) rename {res => k9mail/src/main/res}/layout/accounts_password_prompt.xml (100%) rename {res => k9mail/src/main/res}/layout/actionbar_custom.xml (100%) rename {res => k9mail/src/main/res}/layout/actionbar_indeterminate_progress_actionview.xml (100%) rename {res => k9mail/src/main/res}/layout/choose_account_item.xml (100%) rename {res => k9mail/src/main/res}/layout/choose_identity_item.xml (100%) rename {res => k9mail/src/main/res}/layout/client_certificate_spinner.xml (100%) rename {res => k9mail/src/main/res}/layout/color_picker_dialog.xml (100%) rename {res => k9mail/src/main/res}/layout/edit_identity.xml (100%) rename {res => k9mail/src/main/res}/layout/email_address_list.xml (100%) rename {res => k9mail/src/main/res}/layout/email_address_list_item.xml (100%) rename {res => k9mail/src/main/res}/layout/empty_message_view.xml (100%) rename {res => k9mail/src/main/res}/layout/foldable_linearlayout.xml (100%) rename {res => k9mail/src/main/res}/layout/folder_list.xml (100%) rename {res => k9mail/src/main/res}/layout/folder_list_item.xml (100%) rename {res => k9mail/src/main/res}/layout/list_content_simple.xml (100%) rename {res => k9mail/src/main/res}/layout/message.xml (100%) rename {res => k9mail/src/main/res}/layout/message_compose.xml (100%) rename {res => k9mail/src/main/res}/layout/message_compose_attachment.xml (100%) rename {res => k9mail/src/main/res}/layout/message_list.xml (100%) rename {res => k9mail/src/main/res}/layout/message_list_fragment.xml (100%) rename {res => k9mail/src/main/res}/layout/message_list_item.xml (100%) rename {res => k9mail/src/main/res}/layout/message_list_item_footer.xml (100%) rename {res => k9mail/src/main/res}/layout/message_list_loading.xml (100%) rename {res => k9mail/src/main/res}/layout/message_view_attachment.xml (100%) rename {res => k9mail/src/main/res}/layout/message_view_header.xml (100%) rename {res => k9mail/src/main/res}/layout/message_view_openpgp_layout.xml (100%) rename {res => k9mail/src/main/res}/layout/recipient_dropdown_item.xml (100%) rename {res => k9mail/src/main/res}/layout/slider_preference_dialog.xml (100%) rename {res => k9mail/src/main/res}/layout/split_message_list.xml (100%) rename {res => k9mail/src/main/res}/layout/unread_widget_layout.xml (100%) rename {res => k9mail/src/main/res}/layout/upgrade_databases.xml (100%) rename {res => k9mail/src/main/res}/layout/welcome_message.xml (100%) rename {res => k9mail/src/main/res}/layout/wizard_cancel.xml (100%) rename {res => k9mail/src/main/res}/layout/wizard_done.xml (100%) rename {res => k9mail/src/main/res}/layout/wizard_next.xml (100%) rename {res => k9mail/src/main/res}/layout/wizard_setup.xml (100%) rename {res => k9mail/src/main/res}/layout/wizard_welcome.xml (100%) rename {res => k9mail/src/main/res}/menu/accounts_context.xml (100%) rename {res => k9mail/src/main/res}/menu/accounts_option.xml (100%) rename {res => k9mail/src/main/res}/menu/disabled_accounts_context.xml (100%) rename {res => k9mail/src/main/res}/menu/folder_context.xml (100%) rename {res => k9mail/src/main/res}/menu/folder_list_option.xml (100%) rename {res => k9mail/src/main/res}/menu/folder_select_option.xml (100%) rename {res => k9mail/src/main/res}/menu/manage_identities_context.xml (100%) rename {res => k9mail/src/main/res}/menu/manage_identities_option.xml (100%) rename {res => k9mail/src/main/res}/menu/message_compose_option.xml (100%) rename {res => k9mail/src/main/res}/menu/message_list_context.xml (100%) rename {res => k9mail/src/main/res}/menu/message_list_item_context.xml (100%) rename {res => k9mail/src/main/res}/menu/message_list_option.xml (100%) rename {res => k9mail/src/main/res}/values-ca/strings.xml (100%) rename {res => k9mail/src/main/res}/values-cs/strings.xml (100%) rename {res => k9mail/src/main/res}/values-da/strings.xml (100%) rename {res => k9mail/src/main/res}/values-de/strings.xml (100%) rename {res => k9mail/src/main/res}/values-el/strings.xml (100%) rename {res => k9mail/src/main/res}/values-es/strings.xml (100%) rename {res => k9mail/src/main/res}/values-et/strings.xml (100%) rename {res => k9mail/src/main/res}/values-eu/strings.xml (100%) rename {res => k9mail/src/main/res}/values-fi/strings.xml (100%) rename {res => k9mail/src/main/res}/values-fr/strings.xml (100%) rename {res => k9mail/src/main/res}/values-gl-rES/strings.xml (100%) rename {res => k9mail/src/main/res}/values-gl/strings.xml (100%) rename {res => k9mail/src/main/res}/values-hr/strings.xml (100%) rename {res => k9mail/src/main/res}/values-hu/strings.xml (100%) rename {res => k9mail/src/main/res}/values-it/strings.xml (100%) rename {res => k9mail/src/main/res}/values-iw/strings.xml (100%) rename {res => k9mail/src/main/res}/values-ja/strings.xml (100%) rename {res => k9mail/src/main/res}/values-ko/strings.xml (100%) rename {res => k9mail/src/main/res}/values-land/styles.xml (100%) rename {res => k9mail/src/main/res}/values-lt/strings.xml (100%) rename {res => k9mail/src/main/res}/values-lv/strings.xml (100%) rename {res => k9mail/src/main/res}/values-nb/strings.xml (100%) rename {res => k9mail/src/main/res}/values-nl/strings.xml (100%) rename {res => k9mail/src/main/res}/values-pl/strings.xml (100%) rename {res => k9mail/src/main/res}/values-pt-rBR/strings.xml (100%) rename {res => k9mail/src/main/res}/values-ru/strings.xml (100%) rename {res => k9mail/src/main/res}/values-sk/strings.xml (100%) rename {res => k9mail/src/main/res}/values-sv/strings.xml (100%) rename {res => k9mail/src/main/res}/values-sw600dp-land/styles.xml (100%) rename {res => k9mail/src/main/res}/values-sw600dp-port/styles.xml (100%) rename {res => k9mail/src/main/res}/values-tr/strings.xml (100%) rename {res => k9mail/src/main/res}/values-uk/strings.xml (100%) rename {res => k9mail/src/main/res}/values-v21/styles.xml (100%) rename {res => k9mail/src/main/res}/values-zh-rCN/strings.xml (100%) rename {res => k9mail/src/main/res}/values-zh-rTW/plugin_strings.xml (100%) rename {res => k9mail/src/main/res}/values-zh-rTW/strings.xml (100%) rename {res => k9mail/src/main/res}/values/arrays.xml (100%) rename {res => k9mail/src/main/res}/values/attrs.xml (100%) rename {res => k9mail/src/main/res}/values/colors.xml (100%) rename {res => k9mail/src/main/res}/values/constants.xml (100%) rename {res => k9mail/src/main/res}/values/dimensions.xml (100%) rename {res => k9mail/src/main/res}/values/ids.xml (100%) rename {res => k9mail/src/main/res}/values/strings.xml (100%) rename {res => k9mail/src/main/res}/values/styles.xml (100%) rename {res => k9mail/src/main/res}/values/themes.xml (100%) rename {res => k9mail/src/main/res}/xml-ja/changelog.xml (100%) rename {res => k9mail/src/main/res}/xml/account_settings_preferences.xml (100%) rename {res => k9mail/src/main/res}/xml/changelog_master.xml (100%) rename {res => k9mail/src/main/res}/xml/folder_settings_preferences.xml (100%) rename {res => k9mail/src/main/res}/xml/font_preferences.xml (100%) rename {res => k9mail/src/main/res}/xml/global_preferences.xml (100%) rename {res => k9mail/src/main/res}/xml/providers.xml (100%) rename {res => k9mail/src/main/res}/xml/searchable.xml (100%) rename {res => k9mail/src/main/res}/xml/unread_widget_info.xml (100%) delete mode 100644 tests/proguard.cfg diff --git a/build.gradle b/build.gradle index b6f1745ae..6f91a86ec 100644 --- a/build.gradle +++ b/build.gradle @@ -1,6 +1,6 @@ buildscript { repositories { - mavenCentral() + jcenter() } dependencies { @@ -9,30 +9,6 @@ buildscript { } } -apply plugin: 'android-sdk-manager' -apply plugin: 'com.android.application' -apply plugin: 'checkstyle' -apply plugin: 'findbugs' - -repositories { - jcenter() -} - -dependencies { - compile project(':plugins:Android-PullToRefresh:library') - compile project(':plugins:ckChangeLog:library') - compile project(':plugins:HoloColorPicker') - compile project(':plugins:openpgp-api-library') - compile 'org.apache.james:apache-mime4j-core:0.7.2' - compile 'org.apache.james:apache-mime4j-dom:0.7.2' - compile 'commons-io:commons-io:2.0.1' - compile 'com.jcraft:jzlib:1.0.7' - compile 'com.beetstra.jutf7:jutf7:1.0.0' - compile 'com.android.support:support-v4:21.0.2' - compile 'com.android.support:support-v13:21.0.2' - compile 'net.sourceforge.htmlcleaner:htmlcleaner:2.2' -} - project.ext.preDexLibs = !project.hasProperty('disablePreDex') project.ext.testCoverage = project.hasProperty('testCoverage') @@ -44,102 +20,3 @@ subprojects { } } } - -android { - compileSdkVersion 21 - buildToolsVersion '21.1.2' - - defaultConfig { - minSdkVersion 15 - targetSdkVersion 17 - } - - dexOptions { - preDexLibraries = rootProject.ext.preDexLibs - } - - sourceSets { - main { - manifest.srcFile 'AndroidManifest.xml' - java.srcDirs = ['src'] - res.srcDirs = ['res'] - assets.srcDirs = ['assets'] - } - - androidTest { - manifest.srcFile 'tests/AndroidManifest.xml' - java.srcDirs = ['tests/src'] - assets.srcDirs = ['tests/assets'] - } - } - - signingConfigs { - release - } - - buildTypes { - release { - if (project.hasProperty('storeFile')) { - signingConfig signingConfigs.release - } - } - - debug { - testCoverageEnabled rootProject.testCoverage - } - } - - // Do not abort build if lint finds errors - lintOptions { - abortOnError false - } - - packagingOptions { - exclude 'META-INF/DEPENDENCIES' - exclude 'META-INF/LICENSE' - exclude 'META-INF/LICENSE.txt' - exclude 'META-INF/NOTICE' - exclude 'META-INF/NOTICE.txt' - } - compileOptions { - sourceCompatibility JavaVersion.VERSION_1_6 - targetCompatibility JavaVersion.VERSION_1_6 - } -} - -check.dependsOn 'checkstyle' -task checkstyle(type: Checkstyle) { - ignoreFailures = true - configFile file("config/checkstyle/checkstyle.xml") - - source = project.android.sourceSets.main.java.getSrcDirs() + - project.android.sourceSets.androidTest.java.getSrcDirs() - include '**/*.java' - classpath = files() -} - -check.dependsOn 'findbugs' -task findbugs(type: FindBugs, dependsOn: [':compileDebugJava', ':compileDebugTestJava']) { - ignoreFailures = true - classes = fileTree('build/intermediates/classes/debug/') + - fileTree('build/intermediates/classes/test/debug/') - source = project.android.sourceSets.main.java.getSrcDirs() + - project.android.sourceSets.androidTest.java.getSrcDirs() - classpath = files() - effort = 'max' - includeFilter = file("$rootProject.projectDir/config/findbugs/include_filter.xml") - excludeFilter = file("$rootProject.projectDir/config/findbugs/exclude_filter.xml") -} - -if (project.hasProperty('keyAlias')) { - android.signingConfigs.release.keyAlias = keyAlias -} -if (project.hasProperty('keyPassword')) { - android.signingConfigs.release.keyPassword = keyPassword -} -if (project.hasProperty('storeFile')) { - android.signingConfigs.release.storeFile = file(storeFile) -} -if (project.hasProperty('storePassword')) { - android.signingConfigs.release.storePassword = storePassword -} diff --git a/k9mail/build.gradle b/k9mail/build.gradle new file mode 100644 index 000000000..ac020cec7 --- /dev/null +++ b/k9mail/build.gradle @@ -0,0 +1,104 @@ +apply plugin: 'android-sdk-manager' +apply plugin: 'com.android.application' +apply plugin: 'checkstyle' +apply plugin: 'findbugs' + +repositories { + jcenter() +} + +dependencies { + compile project(':plugins:Android-PullToRefresh:library') + compile project(':plugins:ckChangeLog:library') + compile project(':plugins:HoloColorPicker') + compile project(':plugins:openpgp-api-library') + compile 'org.apache.james:apache-mime4j-core:0.7.2' + compile 'org.apache.james:apache-mime4j-dom:0.7.2' + compile 'commons-io:commons-io:2.0.1' + compile 'com.jcraft:jzlib:1.0.7' + compile 'com.beetstra.jutf7:jutf7:1.0.0' + compile 'com.android.support:support-v4:21.0.2' + compile 'com.android.support:support-v13:21.0.2' + compile 'net.sourceforge.htmlcleaner:htmlcleaner:2.2' +} + +android { + compileSdkVersion 21 + buildToolsVersion '21.1.2' + + defaultConfig { + minSdkVersion 15 + targetSdkVersion 17 + } + + signingConfigs { + release + } + + buildTypes { + release { + if (project.hasProperty('storeFile')) { + signingConfig signingConfigs.release + } + } + + debug { + testCoverageEnabled rootProject.testCoverage + } + } + + // Do not abort build if lint finds errors + lintOptions { + abortOnError false + } + + packagingOptions { + exclude 'META-INF/DEPENDENCIES' + exclude 'META-INF/LICENSE' + exclude 'META-INF/LICENSE.txt' + exclude 'META-INF/NOTICE' + exclude 'META-INF/NOTICE.txt' + } + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_6 + targetCompatibility JavaVersion.VERSION_1_6 + } +} + +check.dependsOn 'checkstyle' +task checkstyle(type: Checkstyle) { + ignoreFailures = true + configFile file("$rootProject.projectDir/config/checkstyle/checkstyle.xml") + + source = project.android.sourceSets.main.java.getSrcDirs() + + project.android.sourceSets.androidTest.java.getSrcDirs() + include '**/*.java' + classpath = files() +} + +check.dependsOn 'findbugs' +task findbugs(type: FindBugs, dependsOn: ['compileDebugJava', 'compileDebugTestJava']) { + ignoreFailures = true + classes = fileTree('build/intermediates/classes/debug/') + + fileTree('build/intermediates/classes/test/debug/') + source = project.android.sourceSets.main.java.getSrcDirs() + + project.android.sourceSets.androidTest.java.getSrcDirs() + classpath = files() + effort = 'max' + includeFilter = file("$rootProject.projectDir/config/findbugs/include_filter.xml") + excludeFilter = file("$rootProject.projectDir/config/findbugs/exclude_filter.xml") +} + +if (project.hasProperty('keyAlias')) { + android.signingConfigs.release.keyAlias = keyAlias +} +if (project.hasProperty('keyPassword')) { + android.signingConfigs.release.keyPassword = keyPassword +} +if (project.hasProperty('storeFile')) { + android.signingConfigs.release.storeFile = file(storeFile) +} +if (project.hasProperty('storePassword')) { + android.signingConfigs.release.storePassword = storePassword +} diff --git a/tests/AndroidManifest.xml b/k9mail/src/androidTest/AndroidManifest.xml similarity index 100% rename from tests/AndroidManifest.xml rename to k9mail/src/androidTest/AndroidManifest.xml diff --git a/tests/src/com/fsck/k9/activity/AccountsTest.java b/k9mail/src/androidTest/java/com/fsck/k9/activity/AccountsTest.java similarity index 100% rename from tests/src/com/fsck/k9/activity/AccountsTest.java rename to k9mail/src/androidTest/java/com/fsck/k9/activity/AccountsTest.java diff --git a/tests/src/com/fsck/k9/activity/MessageReferenceTest.java b/k9mail/src/androidTest/java/com/fsck/k9/activity/MessageReferenceTest.java similarity index 100% rename from tests/src/com/fsck/k9/activity/MessageReferenceTest.java rename to k9mail/src/androidTest/java/com/fsck/k9/activity/MessageReferenceTest.java diff --git a/tests/src/com/fsck/k9/helper/FileHelperTest.java b/k9mail/src/androidTest/java/com/fsck/k9/helper/FileHelperTest.java similarity index 100% rename from tests/src/com/fsck/k9/helper/FileHelperTest.java rename to k9mail/src/androidTest/java/com/fsck/k9/helper/FileHelperTest.java diff --git a/tests/src/com/fsck/k9/helper/HtmlConverterTest.java b/k9mail/src/androidTest/java/com/fsck/k9/helper/HtmlConverterTest.java similarity index 100% rename from tests/src/com/fsck/k9/helper/HtmlConverterTest.java rename to k9mail/src/androidTest/java/com/fsck/k9/helper/HtmlConverterTest.java diff --git a/tests/src/com/fsck/k9/helper/MessageHelperTest.java b/k9mail/src/androidTest/java/com/fsck/k9/helper/MessageHelperTest.java similarity index 100% rename from tests/src/com/fsck/k9/helper/MessageHelperTest.java rename to k9mail/src/androidTest/java/com/fsck/k9/helper/MessageHelperTest.java diff --git a/tests/src/com/fsck/k9/mail/MessageTest.java b/k9mail/src/androidTest/java/com/fsck/k9/mail/MessageTest.java similarity index 100% rename from tests/src/com/fsck/k9/mail/MessageTest.java rename to k9mail/src/androidTest/java/com/fsck/k9/mail/MessageTest.java diff --git a/tests/src/com/fsck/k9/mail/ssl/TrustManagerFactoryTest.java b/k9mail/src/androidTest/java/com/fsck/k9/mail/ssl/TrustManagerFactoryTest.java similarity index 100% rename from tests/src/com/fsck/k9/mail/ssl/TrustManagerFactoryTest.java rename to k9mail/src/androidTest/java/com/fsck/k9/mail/ssl/TrustManagerFactoryTest.java diff --git a/tests/src/com/fsck/k9/mailstore/LocalMessageExtractorTest.java b/k9mail/src/androidTest/java/com/fsck/k9/mailstore/LocalMessageExtractorTest.java similarity index 100% rename from tests/src/com/fsck/k9/mailstore/LocalMessageExtractorTest.java rename to k9mail/src/androidTest/java/com/fsck/k9/mailstore/LocalMessageExtractorTest.java diff --git a/AndroidManifest.xml b/k9mail/src/main/AndroidManifest.xml similarity index 100% rename from AndroidManifest.xml rename to k9mail/src/main/AndroidManifest.xml diff --git a/assets/downloading.html b/k9mail/src/main/assets/downloading.html similarity index 100% rename from assets/downloading.html rename to k9mail/src/main/assets/downloading.html diff --git a/assets/emoticons/24hours.gif b/k9mail/src/main/assets/emoticons/24hours.gif similarity index 100% rename from assets/emoticons/24hours.gif rename to k9mail/src/main/assets/emoticons/24hours.gif diff --git a/assets/emoticons/airplane.gif b/k9mail/src/main/assets/emoticons/airplane.gif similarity index 100% rename from assets/emoticons/airplane.gif rename to k9mail/src/main/assets/emoticons/airplane.gif diff --git a/assets/emoticons/angry.gif b/k9mail/src/main/assets/emoticons/angry.gif similarity index 100% rename from assets/emoticons/angry.gif rename to k9mail/src/main/assets/emoticons/angry.gif diff --git a/assets/emoticons/annoy.gif b/k9mail/src/main/assets/emoticons/annoy.gif similarity index 100% rename from assets/emoticons/annoy.gif rename to k9mail/src/main/assets/emoticons/annoy.gif diff --git a/assets/emoticons/apple.gif b/k9mail/src/main/assets/emoticons/apple.gif similarity index 100% rename from assets/emoticons/apple.gif rename to k9mail/src/main/assets/emoticons/apple.gif diff --git a/assets/emoticons/appli01.gif b/k9mail/src/main/assets/emoticons/appli01.gif similarity index 100% rename from assets/emoticons/appli01.gif rename to k9mail/src/main/assets/emoticons/appli01.gif diff --git a/assets/emoticons/appli02.gif b/k9mail/src/main/assets/emoticons/appli02.gif similarity index 100% rename from assets/emoticons/appli02.gif rename to k9mail/src/main/assets/emoticons/appli02.gif diff --git a/assets/emoticons/aquarius.gif b/k9mail/src/main/assets/emoticons/aquarius.gif similarity index 100% rename from assets/emoticons/aquarius.gif rename to k9mail/src/main/assets/emoticons/aquarius.gif diff --git a/assets/emoticons/aries.gif b/k9mail/src/main/assets/emoticons/aries.gif similarity index 100% rename from assets/emoticons/aries.gif rename to k9mail/src/main/assets/emoticons/aries.gif diff --git a/assets/emoticons/art.gif b/k9mail/src/main/assets/emoticons/art.gif similarity index 100% rename from assets/emoticons/art.gif rename to k9mail/src/main/assets/emoticons/art.gif diff --git a/assets/emoticons/atm.gif b/k9mail/src/main/assets/emoticons/atm.gif similarity index 100% rename from assets/emoticons/atm.gif rename to k9mail/src/main/assets/emoticons/atm.gif diff --git a/assets/emoticons/bag.gif b/k9mail/src/main/assets/emoticons/bag.gif similarity index 100% rename from assets/emoticons/bag.gif rename to k9mail/src/main/assets/emoticons/bag.gif diff --git a/assets/emoticons/ban.gif b/k9mail/src/main/assets/emoticons/ban.gif similarity index 100% rename from assets/emoticons/ban.gif rename to k9mail/src/main/assets/emoticons/ban.gif diff --git a/assets/emoticons/banana.gif b/k9mail/src/main/assets/emoticons/banana.gif similarity index 100% rename from assets/emoticons/banana.gif rename to k9mail/src/main/assets/emoticons/banana.gif diff --git a/assets/emoticons/bank.gif b/k9mail/src/main/assets/emoticons/bank.gif similarity index 100% rename from assets/emoticons/bank.gif rename to k9mail/src/main/assets/emoticons/bank.gif diff --git a/assets/emoticons/bar.gif b/k9mail/src/main/assets/emoticons/bar.gif similarity index 100% rename from assets/emoticons/bar.gif rename to k9mail/src/main/assets/emoticons/bar.gif diff --git a/assets/emoticons/baseball.gif b/k9mail/src/main/assets/emoticons/baseball.gif similarity index 100% rename from assets/emoticons/baseball.gif rename to k9mail/src/main/assets/emoticons/baseball.gif diff --git a/assets/emoticons/basketball.gif b/k9mail/src/main/assets/emoticons/basketball.gif similarity index 100% rename from assets/emoticons/basketball.gif rename to k9mail/src/main/assets/emoticons/basketball.gif diff --git a/assets/emoticons/bearing.gif b/k9mail/src/main/assets/emoticons/bearing.gif similarity index 100% rename from assets/emoticons/bearing.gif rename to k9mail/src/main/assets/emoticons/bearing.gif diff --git a/assets/emoticons/beer.gif b/k9mail/src/main/assets/emoticons/beer.gif similarity index 100% rename from assets/emoticons/beer.gif rename to k9mail/src/main/assets/emoticons/beer.gif diff --git a/assets/emoticons/bell.gif b/k9mail/src/main/assets/emoticons/bell.gif similarity index 100% rename from assets/emoticons/bell.gif rename to k9mail/src/main/assets/emoticons/bell.gif diff --git a/assets/emoticons/bicycle.gif b/k9mail/src/main/assets/emoticons/bicycle.gif similarity index 100% rename from assets/emoticons/bicycle.gif rename to k9mail/src/main/assets/emoticons/bicycle.gif diff --git a/assets/emoticons/birthday.gif b/k9mail/src/main/assets/emoticons/birthday.gif similarity index 100% rename from assets/emoticons/birthday.gif rename to k9mail/src/main/assets/emoticons/birthday.gif diff --git a/assets/emoticons/bleah.gif b/k9mail/src/main/assets/emoticons/bleah.gif similarity index 100% rename from assets/emoticons/bleah.gif rename to k9mail/src/main/assets/emoticons/bleah.gif diff --git a/assets/emoticons/bomb.gif b/k9mail/src/main/assets/emoticons/bomb.gif similarity index 100% rename from assets/emoticons/bomb.gif rename to k9mail/src/main/assets/emoticons/bomb.gif diff --git a/assets/emoticons/book.gif b/k9mail/src/main/assets/emoticons/book.gif similarity index 100% rename from assets/emoticons/book.gif rename to k9mail/src/main/assets/emoticons/book.gif diff --git a/assets/emoticons/bottle.gif b/k9mail/src/main/assets/emoticons/bottle.gif similarity index 100% rename from assets/emoticons/bottle.gif rename to k9mail/src/main/assets/emoticons/bottle.gif diff --git a/assets/emoticons/boutique.gif b/k9mail/src/main/assets/emoticons/boutique.gif similarity index 100% rename from assets/emoticons/boutique.gif rename to k9mail/src/main/assets/emoticons/boutique.gif diff --git a/assets/emoticons/bread.gif b/k9mail/src/main/assets/emoticons/bread.gif similarity index 100% rename from assets/emoticons/bread.gif rename to k9mail/src/main/assets/emoticons/bread.gif diff --git a/assets/emoticons/bud.gif b/k9mail/src/main/assets/emoticons/bud.gif similarity index 100% rename from assets/emoticons/bud.gif rename to k9mail/src/main/assets/emoticons/bud.gif diff --git a/assets/emoticons/building.gif b/k9mail/src/main/assets/emoticons/building.gif similarity index 100% rename from assets/emoticons/building.gif rename to k9mail/src/main/assets/emoticons/building.gif diff --git a/assets/emoticons/bullettrain.gif b/k9mail/src/main/assets/emoticons/bullettrain.gif similarity index 100% rename from assets/emoticons/bullettrain.gif rename to k9mail/src/main/assets/emoticons/bullettrain.gif diff --git a/assets/emoticons/bus.gif b/k9mail/src/main/assets/emoticons/bus.gif similarity index 100% rename from assets/emoticons/bus.gif rename to k9mail/src/main/assets/emoticons/bus.gif diff --git a/assets/emoticons/by-d.gif b/k9mail/src/main/assets/emoticons/by-d.gif similarity index 100% rename from assets/emoticons/by-d.gif rename to k9mail/src/main/assets/emoticons/by-d.gif diff --git a/assets/emoticons/cafe.gif b/k9mail/src/main/assets/emoticons/cafe.gif similarity index 100% rename from assets/emoticons/cafe.gif rename to k9mail/src/main/assets/emoticons/cafe.gif diff --git a/assets/emoticons/cake.gif b/k9mail/src/main/assets/emoticons/cake.gif similarity index 100% rename from assets/emoticons/cake.gif rename to k9mail/src/main/assets/emoticons/cake.gif diff --git a/assets/emoticons/camera.gif b/k9mail/src/main/assets/emoticons/camera.gif similarity index 100% rename from assets/emoticons/camera.gif rename to k9mail/src/main/assets/emoticons/camera.gif diff --git a/assets/emoticons/cancer.gif b/k9mail/src/main/assets/emoticons/cancer.gif similarity index 100% rename from assets/emoticons/cancer.gif rename to k9mail/src/main/assets/emoticons/cancer.gif diff --git a/assets/emoticons/capricornus.gif b/k9mail/src/main/assets/emoticons/capricornus.gif similarity index 100% rename from assets/emoticons/capricornus.gif rename to k9mail/src/main/assets/emoticons/capricornus.gif diff --git a/assets/emoticons/car.gif b/k9mail/src/main/assets/emoticons/car.gif similarity index 100% rename from assets/emoticons/car.gif rename to k9mail/src/main/assets/emoticons/car.gif diff --git a/assets/emoticons/carouselpony.gif b/k9mail/src/main/assets/emoticons/carouselpony.gif similarity index 100% rename from assets/emoticons/carouselpony.gif rename to k9mail/src/main/assets/emoticons/carouselpony.gif diff --git a/assets/emoticons/cat.gif b/k9mail/src/main/assets/emoticons/cat.gif similarity index 100% rename from assets/emoticons/cat.gif rename to k9mail/src/main/assets/emoticons/cat.gif diff --git a/assets/emoticons/catface.gif b/k9mail/src/main/assets/emoticons/catface.gif similarity index 100% rename from assets/emoticons/catface.gif rename to k9mail/src/main/assets/emoticons/catface.gif diff --git a/assets/emoticons/cd.gif b/k9mail/src/main/assets/emoticons/cd.gif similarity index 100% rename from assets/emoticons/cd.gif rename to k9mail/src/main/assets/emoticons/cd.gif diff --git a/assets/emoticons/chair.gif b/k9mail/src/main/assets/emoticons/chair.gif similarity index 100% rename from assets/emoticons/chair.gif rename to k9mail/src/main/assets/emoticons/chair.gif diff --git a/assets/emoticons/cherry.gif b/k9mail/src/main/assets/emoticons/cherry.gif similarity index 100% rename from assets/emoticons/cherry.gif rename to k9mail/src/main/assets/emoticons/cherry.gif diff --git a/assets/emoticons/cherryblossom.gif b/k9mail/src/main/assets/emoticons/cherryblossom.gif similarity index 100% rename from assets/emoticons/cherryblossom.gif rename to k9mail/src/main/assets/emoticons/cherryblossom.gif diff --git a/assets/emoticons/chick.gif b/k9mail/src/main/assets/emoticons/chick.gif similarity index 100% rename from assets/emoticons/chick.gif rename to k9mail/src/main/assets/emoticons/chick.gif diff --git a/assets/emoticons/clear.gif b/k9mail/src/main/assets/emoticons/clear.gif similarity index 100% rename from assets/emoticons/clear.gif rename to k9mail/src/main/assets/emoticons/clear.gif diff --git a/assets/emoticons/clip.gif b/k9mail/src/main/assets/emoticons/clip.gif similarity index 100% rename from assets/emoticons/clip.gif rename to k9mail/src/main/assets/emoticons/clip.gif diff --git a/assets/emoticons/clock.gif b/k9mail/src/main/assets/emoticons/clock.gif similarity index 100% rename from assets/emoticons/clock.gif rename to k9mail/src/main/assets/emoticons/clock.gif diff --git a/assets/emoticons/cloud.gif b/k9mail/src/main/assets/emoticons/cloud.gif similarity index 100% rename from assets/emoticons/cloud.gif rename to k9mail/src/main/assets/emoticons/cloud.gif diff --git a/assets/emoticons/clover.gif b/k9mail/src/main/assets/emoticons/clover.gif similarity index 100% rename from assets/emoticons/clover.gif rename to k9mail/src/main/assets/emoticons/clover.gif diff --git a/assets/emoticons/club.gif b/k9mail/src/main/assets/emoticons/club.gif similarity index 100% rename from assets/emoticons/club.gif rename to k9mail/src/main/assets/emoticons/club.gif diff --git a/assets/emoticons/coldsweats01.gif b/k9mail/src/main/assets/emoticons/coldsweats01.gif similarity index 100% rename from assets/emoticons/coldsweats01.gif rename to k9mail/src/main/assets/emoticons/coldsweats01.gif diff --git a/assets/emoticons/coldsweats02.gif b/k9mail/src/main/assets/emoticons/coldsweats02.gif similarity index 100% rename from assets/emoticons/coldsweats02.gif rename to k9mail/src/main/assets/emoticons/coldsweats02.gif diff --git a/assets/emoticons/confident.gif b/k9mail/src/main/assets/emoticons/confident.gif similarity index 100% rename from assets/emoticons/confident.gif rename to k9mail/src/main/assets/emoticons/confident.gif diff --git a/assets/emoticons/copyright.gif b/k9mail/src/main/assets/emoticons/copyright.gif similarity index 100% rename from assets/emoticons/copyright.gif rename to k9mail/src/main/assets/emoticons/copyright.gif diff --git a/assets/emoticons/crown.gif b/k9mail/src/main/assets/emoticons/crown.gif similarity index 100% rename from assets/emoticons/crown.gif rename to k9mail/src/main/assets/emoticons/crown.gif diff --git a/assets/emoticons/crying.gif b/k9mail/src/main/assets/emoticons/crying.gif similarity index 100% rename from assets/emoticons/crying.gif rename to k9mail/src/main/assets/emoticons/crying.gif diff --git a/assets/emoticons/cute.gif b/k9mail/src/main/assets/emoticons/cute.gif similarity index 100% rename from assets/emoticons/cute.gif rename to k9mail/src/main/assets/emoticons/cute.gif diff --git a/assets/emoticons/d-point.gif b/k9mail/src/main/assets/emoticons/d-point.gif similarity index 100% rename from assets/emoticons/d-point.gif rename to k9mail/src/main/assets/emoticons/d-point.gif diff --git a/assets/emoticons/danger.gif b/k9mail/src/main/assets/emoticons/danger.gif similarity index 100% rename from assets/emoticons/danger.gif rename to k9mail/src/main/assets/emoticons/danger.gif diff --git a/assets/emoticons/dash.gif b/k9mail/src/main/assets/emoticons/dash.gif similarity index 100% rename from assets/emoticons/dash.gif rename to k9mail/src/main/assets/emoticons/dash.gif diff --git a/assets/emoticons/delicious.gif b/k9mail/src/main/assets/emoticons/delicious.gif similarity index 100% rename from assets/emoticons/delicious.gif rename to k9mail/src/main/assets/emoticons/delicious.gif diff --git a/assets/emoticons/denim.gif b/k9mail/src/main/assets/emoticons/denim.gif similarity index 100% rename from assets/emoticons/denim.gif rename to k9mail/src/main/assets/emoticons/denim.gif diff --git a/assets/emoticons/despair.gif b/k9mail/src/main/assets/emoticons/despair.gif similarity index 100% rename from assets/emoticons/despair.gif rename to k9mail/src/main/assets/emoticons/despair.gif diff --git a/assets/emoticons/diamond.gif b/k9mail/src/main/assets/emoticons/diamond.gif similarity index 100% rename from assets/emoticons/diamond.gif rename to k9mail/src/main/assets/emoticons/diamond.gif diff --git a/assets/emoticons/dog.gif b/k9mail/src/main/assets/emoticons/dog.gif similarity index 100% rename from assets/emoticons/dog.gif rename to k9mail/src/main/assets/emoticons/dog.gif diff --git a/assets/emoticons/dollar.gif b/k9mail/src/main/assets/emoticons/dollar.gif similarity index 100% rename from assets/emoticons/dollar.gif rename to k9mail/src/main/assets/emoticons/dollar.gif diff --git a/assets/emoticons/door.gif b/k9mail/src/main/assets/emoticons/door.gif similarity index 100% rename from assets/emoticons/door.gif rename to k9mail/src/main/assets/emoticons/door.gif diff --git a/assets/emoticons/down.gif b/k9mail/src/main/assets/emoticons/down.gif similarity index 100% rename from assets/emoticons/down.gif rename to k9mail/src/main/assets/emoticons/down.gif diff --git a/assets/emoticons/downwardleft.gif b/k9mail/src/main/assets/emoticons/downwardleft.gif similarity index 100% rename from assets/emoticons/downwardleft.gif rename to k9mail/src/main/assets/emoticons/downwardleft.gif diff --git a/assets/emoticons/downwardright.gif b/k9mail/src/main/assets/emoticons/downwardright.gif similarity index 100% rename from assets/emoticons/downwardright.gif rename to k9mail/src/main/assets/emoticons/downwardright.gif diff --git a/assets/emoticons/drama.gif b/k9mail/src/main/assets/emoticons/drama.gif similarity index 100% rename from assets/emoticons/drama.gif rename to k9mail/src/main/assets/emoticons/drama.gif diff --git a/assets/emoticons/ear.gif b/k9mail/src/main/assets/emoticons/ear.gif similarity index 100% rename from assets/emoticons/ear.gif rename to k9mail/src/main/assets/emoticons/ear.gif diff --git a/assets/emoticons/eight.gif b/k9mail/src/main/assets/emoticons/eight.gif similarity index 100% rename from assets/emoticons/eight.gif rename to k9mail/src/main/assets/emoticons/eight.gif diff --git a/assets/emoticons/empty.gif b/k9mail/src/main/assets/emoticons/empty.gif similarity index 100% rename from assets/emoticons/empty.gif rename to k9mail/src/main/assets/emoticons/empty.gif diff --git a/assets/emoticons/end.gif b/k9mail/src/main/assets/emoticons/end.gif similarity index 100% rename from assets/emoticons/end.gif rename to k9mail/src/main/assets/emoticons/end.gif diff --git a/assets/emoticons/enter.gif b/k9mail/src/main/assets/emoticons/enter.gif similarity index 100% rename from assets/emoticons/enter.gif rename to k9mail/src/main/assets/emoticons/enter.gif diff --git a/assets/emoticons/event.gif b/k9mail/src/main/assets/emoticons/event.gif similarity index 100% rename from assets/emoticons/event.gif rename to k9mail/src/main/assets/emoticons/event.gif diff --git a/assets/emoticons/eye.gif b/k9mail/src/main/assets/emoticons/eye.gif similarity index 100% rename from assets/emoticons/eye.gif rename to k9mail/src/main/assets/emoticons/eye.gif diff --git a/assets/emoticons/eyeglass.gif b/k9mail/src/main/assets/emoticons/eyeglass.gif similarity index 100% rename from assets/emoticons/eyeglass.gif rename to k9mail/src/main/assets/emoticons/eyeglass.gif diff --git a/assets/emoticons/fastfood.gif b/k9mail/src/main/assets/emoticons/fastfood.gif similarity index 100% rename from assets/emoticons/fastfood.gif rename to k9mail/src/main/assets/emoticons/fastfood.gif diff --git a/assets/emoticons/faxto.gif b/k9mail/src/main/assets/emoticons/faxto.gif similarity index 100% rename from assets/emoticons/faxto.gif rename to k9mail/src/main/assets/emoticons/faxto.gif diff --git a/assets/emoticons/fish.gif b/k9mail/src/main/assets/emoticons/fish.gif similarity index 100% rename from assets/emoticons/fish.gif rename to k9mail/src/main/assets/emoticons/fish.gif diff --git a/assets/emoticons/five.gif b/k9mail/src/main/assets/emoticons/five.gif similarity index 100% rename from assets/emoticons/five.gif rename to k9mail/src/main/assets/emoticons/five.gif diff --git a/assets/emoticons/flag.gif b/k9mail/src/main/assets/emoticons/flag.gif similarity index 100% rename from assets/emoticons/flag.gif rename to k9mail/src/main/assets/emoticons/flag.gif diff --git a/assets/emoticons/flair.gif b/k9mail/src/main/assets/emoticons/flair.gif similarity index 100% rename from assets/emoticons/flair.gif rename to k9mail/src/main/assets/emoticons/flair.gif diff --git a/assets/emoticons/foot.gif b/k9mail/src/main/assets/emoticons/foot.gif similarity index 100% rename from assets/emoticons/foot.gif rename to k9mail/src/main/assets/emoticons/foot.gif diff --git a/assets/emoticons/four.gif b/k9mail/src/main/assets/emoticons/four.gif similarity index 100% rename from assets/emoticons/four.gif rename to k9mail/src/main/assets/emoticons/four.gif diff --git a/assets/emoticons/free.gif b/k9mail/src/main/assets/emoticons/free.gif similarity index 100% rename from assets/emoticons/free.gif rename to k9mail/src/main/assets/emoticons/free.gif diff --git a/assets/emoticons/freedial.gif b/k9mail/src/main/assets/emoticons/freedial.gif similarity index 100% rename from assets/emoticons/freedial.gif rename to k9mail/src/main/assets/emoticons/freedial.gif diff --git a/assets/emoticons/fuji.gif b/k9mail/src/main/assets/emoticons/fuji.gif similarity index 100% rename from assets/emoticons/fuji.gif rename to k9mail/src/main/assets/emoticons/fuji.gif diff --git a/assets/emoticons/full.gif b/k9mail/src/main/assets/emoticons/full.gif similarity index 100% rename from assets/emoticons/full.gif rename to k9mail/src/main/assets/emoticons/full.gif diff --git a/assets/emoticons/fullmoon.gif b/k9mail/src/main/assets/emoticons/fullmoon.gif similarity index 100% rename from assets/emoticons/fullmoon.gif rename to k9mail/src/main/assets/emoticons/fullmoon.gif diff --git a/assets/emoticons/game.gif b/k9mail/src/main/assets/emoticons/game.gif similarity index 100% rename from assets/emoticons/game.gif rename to k9mail/src/main/assets/emoticons/game.gif diff --git a/assets/emoticons/gasstation.gif b/k9mail/src/main/assets/emoticons/gasstation.gif similarity index 100% rename from assets/emoticons/gasstation.gif rename to k9mail/src/main/assets/emoticons/gasstation.gif diff --git a/assets/emoticons/gawk.gif b/k9mail/src/main/assets/emoticons/gawk.gif similarity index 100% rename from assets/emoticons/gawk.gif rename to k9mail/src/main/assets/emoticons/gawk.gif diff --git a/assets/emoticons/gemini.gif b/k9mail/src/main/assets/emoticons/gemini.gif similarity index 100% rename from assets/emoticons/gemini.gif rename to k9mail/src/main/assets/emoticons/gemini.gif diff --git a/assets/emoticons/golf.gif b/k9mail/src/main/assets/emoticons/golf.gif similarity index 100% rename from assets/emoticons/golf.gif rename to k9mail/src/main/assets/emoticons/golf.gif diff --git a/assets/emoticons/good.gif b/k9mail/src/main/assets/emoticons/good.gif similarity index 100% rename from assets/emoticons/good.gif rename to k9mail/src/main/assets/emoticons/good.gif diff --git a/assets/emoticons/hairsalon.gif b/k9mail/src/main/assets/emoticons/hairsalon.gif similarity index 100% rename from assets/emoticons/hairsalon.gif rename to k9mail/src/main/assets/emoticons/hairsalon.gif diff --git a/assets/emoticons/happy01.gif b/k9mail/src/main/assets/emoticons/happy01.gif similarity index 100% rename from assets/emoticons/happy01.gif rename to k9mail/src/main/assets/emoticons/happy01.gif diff --git a/assets/emoticons/happy02.gif b/k9mail/src/main/assets/emoticons/happy02.gif similarity index 100% rename from assets/emoticons/happy02.gif rename to k9mail/src/main/assets/emoticons/happy02.gif diff --git a/assets/emoticons/heart.gif b/k9mail/src/main/assets/emoticons/heart.gif similarity index 100% rename from assets/emoticons/heart.gif rename to k9mail/src/main/assets/emoticons/heart.gif diff --git a/assets/emoticons/heart01.gif b/k9mail/src/main/assets/emoticons/heart01.gif similarity index 100% rename from assets/emoticons/heart01.gif rename to k9mail/src/main/assets/emoticons/heart01.gif diff --git a/assets/emoticons/heart02.gif b/k9mail/src/main/assets/emoticons/heart02.gif similarity index 100% rename from assets/emoticons/heart02.gif rename to k9mail/src/main/assets/emoticons/heart02.gif diff --git a/assets/emoticons/heart03.gif b/k9mail/src/main/assets/emoticons/heart03.gif similarity index 100% rename from assets/emoticons/heart03.gif rename to k9mail/src/main/assets/emoticons/heart03.gif diff --git a/assets/emoticons/heart04.gif b/k9mail/src/main/assets/emoticons/heart04.gif similarity index 100% rename from assets/emoticons/heart04.gif rename to k9mail/src/main/assets/emoticons/heart04.gif diff --git a/assets/emoticons/horse.gif b/k9mail/src/main/assets/emoticons/horse.gif similarity index 100% rename from assets/emoticons/horse.gif rename to k9mail/src/main/assets/emoticons/horse.gif diff --git a/assets/emoticons/hospital.gif b/k9mail/src/main/assets/emoticons/hospital.gif similarity index 100% rename from assets/emoticons/hospital.gif rename to k9mail/src/main/assets/emoticons/hospital.gif diff --git a/assets/emoticons/hotel.gif b/k9mail/src/main/assets/emoticons/hotel.gif similarity index 100% rename from assets/emoticons/hotel.gif rename to k9mail/src/main/assets/emoticons/hotel.gif diff --git a/assets/emoticons/house.gif b/k9mail/src/main/assets/emoticons/house.gif similarity index 100% rename from assets/emoticons/house.gif rename to k9mail/src/main/assets/emoticons/house.gif diff --git a/assets/emoticons/id.gif b/k9mail/src/main/assets/emoticons/id.gif similarity index 100% rename from assets/emoticons/id.gif rename to k9mail/src/main/assets/emoticons/id.gif diff --git a/assets/emoticons/impact.gif b/k9mail/src/main/assets/emoticons/impact.gif similarity index 100% rename from assets/emoticons/impact.gif rename to k9mail/src/main/assets/emoticons/impact.gif diff --git a/assets/emoticons/info01.gif b/k9mail/src/main/assets/emoticons/info01.gif similarity index 100% rename from assets/emoticons/info01.gif rename to k9mail/src/main/assets/emoticons/info01.gif diff --git a/assets/emoticons/info02.gif b/k9mail/src/main/assets/emoticons/info02.gif similarity index 100% rename from assets/emoticons/info02.gif rename to k9mail/src/main/assets/emoticons/info02.gif diff --git a/assets/emoticons/japanesetea.gif b/k9mail/src/main/assets/emoticons/japanesetea.gif similarity index 100% rename from assets/emoticons/japanesetea.gif rename to k9mail/src/main/assets/emoticons/japanesetea.gif diff --git a/assets/emoticons/karaoke.gif b/k9mail/src/main/assets/emoticons/karaoke.gif similarity index 100% rename from assets/emoticons/karaoke.gif rename to k9mail/src/main/assets/emoticons/karaoke.gif diff --git a/assets/emoticons/key.gif b/k9mail/src/main/assets/emoticons/key.gif similarity index 100% rename from assets/emoticons/key.gif rename to k9mail/src/main/assets/emoticons/key.gif diff --git a/assets/emoticons/kissmark.gif b/k9mail/src/main/assets/emoticons/kissmark.gif similarity index 100% rename from assets/emoticons/kissmark.gif rename to k9mail/src/main/assets/emoticons/kissmark.gif diff --git a/assets/emoticons/leftright.gif b/k9mail/src/main/assets/emoticons/leftright.gif similarity index 100% rename from assets/emoticons/leftright.gif rename to k9mail/src/main/assets/emoticons/leftright.gif diff --git a/assets/emoticons/leo.gif b/k9mail/src/main/assets/emoticons/leo.gif similarity index 100% rename from assets/emoticons/leo.gif rename to k9mail/src/main/assets/emoticons/leo.gif diff --git a/assets/emoticons/libra.gif b/k9mail/src/main/assets/emoticons/libra.gif similarity index 100% rename from assets/emoticons/libra.gif rename to k9mail/src/main/assets/emoticons/libra.gif diff --git a/assets/emoticons/loveletter.gif b/k9mail/src/main/assets/emoticons/loveletter.gif similarity index 100% rename from assets/emoticons/loveletter.gif rename to k9mail/src/main/assets/emoticons/loveletter.gif diff --git a/assets/emoticons/lovely.gif b/k9mail/src/main/assets/emoticons/lovely.gif similarity index 100% rename from assets/emoticons/lovely.gif rename to k9mail/src/main/assets/emoticons/lovely.gif diff --git a/assets/emoticons/mail.gif b/k9mail/src/main/assets/emoticons/mail.gif similarity index 100% rename from assets/emoticons/mail.gif rename to k9mail/src/main/assets/emoticons/mail.gif diff --git a/assets/emoticons/mailto.gif b/k9mail/src/main/assets/emoticons/mailto.gif similarity index 100% rename from assets/emoticons/mailto.gif rename to k9mail/src/main/assets/emoticons/mailto.gif diff --git a/assets/emoticons/maple.gif b/k9mail/src/main/assets/emoticons/maple.gif similarity index 100% rename from assets/emoticons/maple.gif rename to k9mail/src/main/assets/emoticons/maple.gif diff --git a/assets/emoticons/memo.gif b/k9mail/src/main/assets/emoticons/memo.gif similarity index 100% rename from assets/emoticons/memo.gif rename to k9mail/src/main/assets/emoticons/memo.gif diff --git a/assets/emoticons/mist.gif b/k9mail/src/main/assets/emoticons/mist.gif similarity index 100% rename from assets/emoticons/mist.gif rename to k9mail/src/main/assets/emoticons/mist.gif diff --git a/assets/emoticons/mobaq.gif b/k9mail/src/main/assets/emoticons/mobaq.gif similarity index 100% rename from assets/emoticons/mobaq.gif rename to k9mail/src/main/assets/emoticons/mobaq.gif diff --git a/assets/emoticons/mobilephone.gif b/k9mail/src/main/assets/emoticons/mobilephone.gif similarity index 100% rename from assets/emoticons/mobilephone.gif rename to k9mail/src/main/assets/emoticons/mobilephone.gif diff --git a/assets/emoticons/moneybag.gif b/k9mail/src/main/assets/emoticons/moneybag.gif similarity index 100% rename from assets/emoticons/moneybag.gif rename to k9mail/src/main/assets/emoticons/moneybag.gif diff --git a/assets/emoticons/moon1.gif b/k9mail/src/main/assets/emoticons/moon1.gif similarity index 100% rename from assets/emoticons/moon1.gif rename to k9mail/src/main/assets/emoticons/moon1.gif diff --git a/assets/emoticons/moon2.gif b/k9mail/src/main/assets/emoticons/moon2.gif similarity index 100% rename from assets/emoticons/moon2.gif rename to k9mail/src/main/assets/emoticons/moon2.gif diff --git a/assets/emoticons/moon3.gif b/k9mail/src/main/assets/emoticons/moon3.gif similarity index 100% rename from assets/emoticons/moon3.gif rename to k9mail/src/main/assets/emoticons/moon3.gif diff --git a/assets/emoticons/motorsports.gif b/k9mail/src/main/assets/emoticons/motorsports.gif similarity index 100% rename from assets/emoticons/motorsports.gif rename to k9mail/src/main/assets/emoticons/motorsports.gif diff --git a/assets/emoticons/movie.gif b/k9mail/src/main/assets/emoticons/movie.gif similarity index 100% rename from assets/emoticons/movie.gif rename to k9mail/src/main/assets/emoticons/movie.gif diff --git a/assets/emoticons/music.gif b/k9mail/src/main/assets/emoticons/music.gif similarity index 100% rename from assets/emoticons/music.gif rename to k9mail/src/main/assets/emoticons/music.gif diff --git a/assets/emoticons/new.gif b/k9mail/src/main/assets/emoticons/new.gif similarity index 100% rename from assets/emoticons/new.gif rename to k9mail/src/main/assets/emoticons/new.gif diff --git a/assets/emoticons/newmoon.gif b/k9mail/src/main/assets/emoticons/newmoon.gif similarity index 100% rename from assets/emoticons/newmoon.gif rename to k9mail/src/main/assets/emoticons/newmoon.gif diff --git a/assets/emoticons/ng.gif b/k9mail/src/main/assets/emoticons/ng.gif similarity index 100% rename from assets/emoticons/ng.gif rename to k9mail/src/main/assets/emoticons/ng.gif diff --git a/assets/emoticons/night.gif b/k9mail/src/main/assets/emoticons/night.gif similarity index 100% rename from assets/emoticons/night.gif rename to k9mail/src/main/assets/emoticons/night.gif diff --git a/assets/emoticons/nine.gif b/k9mail/src/main/assets/emoticons/nine.gif similarity index 100% rename from assets/emoticons/nine.gif rename to k9mail/src/main/assets/emoticons/nine.gif diff --git a/assets/emoticons/noodle.gif b/k9mail/src/main/assets/emoticons/noodle.gif similarity index 100% rename from assets/emoticons/noodle.gif rename to k9mail/src/main/assets/emoticons/noodle.gif diff --git a/assets/emoticons/nosmoking.gif b/k9mail/src/main/assets/emoticons/nosmoking.gif similarity index 100% rename from assets/emoticons/nosmoking.gif rename to k9mail/src/main/assets/emoticons/nosmoking.gif diff --git a/assets/emoticons/note.gif b/k9mail/src/main/assets/emoticons/note.gif similarity index 100% rename from assets/emoticons/note.gif rename to k9mail/src/main/assets/emoticons/note.gif diff --git a/assets/emoticons/notes.gif b/k9mail/src/main/assets/emoticons/notes.gif similarity index 100% rename from assets/emoticons/notes.gif rename to k9mail/src/main/assets/emoticons/notes.gif diff --git a/assets/emoticons/ok.gif b/k9mail/src/main/assets/emoticons/ok.gif similarity index 100% rename from assets/emoticons/ok.gif rename to k9mail/src/main/assets/emoticons/ok.gif diff --git a/assets/emoticons/on.gif b/k9mail/src/main/assets/emoticons/on.gif similarity index 100% rename from assets/emoticons/on.gif rename to k9mail/src/main/assets/emoticons/on.gif diff --git a/assets/emoticons/one.gif b/k9mail/src/main/assets/emoticons/one.gif similarity index 100% rename from assets/emoticons/one.gif rename to k9mail/src/main/assets/emoticons/one.gif diff --git a/assets/emoticons/paper.gif b/k9mail/src/main/assets/emoticons/paper.gif similarity index 100% rename from assets/emoticons/paper.gif rename to k9mail/src/main/assets/emoticons/paper.gif diff --git a/assets/emoticons/parking.gif b/k9mail/src/main/assets/emoticons/parking.gif similarity index 100% rename from assets/emoticons/parking.gif rename to k9mail/src/main/assets/emoticons/parking.gif diff --git a/assets/emoticons/pass.gif b/k9mail/src/main/assets/emoticons/pass.gif similarity index 100% rename from assets/emoticons/pass.gif rename to k9mail/src/main/assets/emoticons/pass.gif diff --git a/assets/emoticons/pc.gif b/k9mail/src/main/assets/emoticons/pc.gif similarity index 100% rename from assets/emoticons/pc.gif rename to k9mail/src/main/assets/emoticons/pc.gif diff --git a/assets/emoticons/pen.gif b/k9mail/src/main/assets/emoticons/pen.gif similarity index 100% rename from assets/emoticons/pen.gif rename to k9mail/src/main/assets/emoticons/pen.gif diff --git a/assets/emoticons/pencil.gif b/k9mail/src/main/assets/emoticons/pencil.gif similarity index 100% rename from assets/emoticons/pencil.gif rename to k9mail/src/main/assets/emoticons/pencil.gif diff --git a/assets/emoticons/penguin.gif b/k9mail/src/main/assets/emoticons/penguin.gif similarity index 100% rename from assets/emoticons/penguin.gif rename to k9mail/src/main/assets/emoticons/penguin.gif diff --git a/assets/emoticons/phoneto.gif b/k9mail/src/main/assets/emoticons/phoneto.gif similarity index 100% rename from assets/emoticons/phoneto.gif rename to k9mail/src/main/assets/emoticons/phoneto.gif diff --git a/assets/emoticons/pig.gif b/k9mail/src/main/assets/emoticons/pig.gif similarity index 100% rename from assets/emoticons/pig.gif rename to k9mail/src/main/assets/emoticons/pig.gif diff --git a/assets/emoticons/pisces.gif b/k9mail/src/main/assets/emoticons/pisces.gif similarity index 100% rename from assets/emoticons/pisces.gif rename to k9mail/src/main/assets/emoticons/pisces.gif diff --git a/assets/emoticons/pocketbell.gif b/k9mail/src/main/assets/emoticons/pocketbell.gif similarity index 100% rename from assets/emoticons/pocketbell.gif rename to k9mail/src/main/assets/emoticons/pocketbell.gif diff --git a/assets/emoticons/postoffice.gif b/k9mail/src/main/assets/emoticons/postoffice.gif similarity index 100% rename from assets/emoticons/postoffice.gif rename to k9mail/src/main/assets/emoticons/postoffice.gif diff --git a/assets/emoticons/pouch.gif b/k9mail/src/main/assets/emoticons/pouch.gif similarity index 100% rename from assets/emoticons/pouch.gif rename to k9mail/src/main/assets/emoticons/pouch.gif diff --git a/assets/emoticons/pout.gif b/k9mail/src/main/assets/emoticons/pout.gif similarity index 100% rename from assets/emoticons/pout.gif rename to k9mail/src/main/assets/emoticons/pout.gif diff --git a/assets/emoticons/present.gif b/k9mail/src/main/assets/emoticons/present.gif similarity index 100% rename from assets/emoticons/present.gif rename to k9mail/src/main/assets/emoticons/present.gif diff --git a/assets/emoticons/punch.gif b/k9mail/src/main/assets/emoticons/punch.gif similarity index 100% rename from assets/emoticons/punch.gif rename to k9mail/src/main/assets/emoticons/punch.gif diff --git a/assets/emoticons/r-mark.gif b/k9mail/src/main/assets/emoticons/r-mark.gif similarity index 100% rename from assets/emoticons/r-mark.gif rename to k9mail/src/main/assets/emoticons/r-mark.gif diff --git a/assets/emoticons/rain.gif b/k9mail/src/main/assets/emoticons/rain.gif similarity index 100% rename from assets/emoticons/rain.gif rename to k9mail/src/main/assets/emoticons/rain.gif diff --git a/assets/emoticons/recycle.gif b/k9mail/src/main/assets/emoticons/recycle.gif similarity index 100% rename from assets/emoticons/recycle.gif rename to k9mail/src/main/assets/emoticons/recycle.gif diff --git a/assets/emoticons/restaurant.gif b/k9mail/src/main/assets/emoticons/restaurant.gif similarity index 100% rename from assets/emoticons/restaurant.gif rename to k9mail/src/main/assets/emoticons/restaurant.gif diff --git a/assets/emoticons/ribbon.gif b/k9mail/src/main/assets/emoticons/ribbon.gif similarity index 100% rename from assets/emoticons/ribbon.gif rename to k9mail/src/main/assets/emoticons/ribbon.gif diff --git a/assets/emoticons/riceball.gif b/k9mail/src/main/assets/emoticons/riceball.gif similarity index 100% rename from assets/emoticons/riceball.gif rename to k9mail/src/main/assets/emoticons/riceball.gif diff --git a/assets/emoticons/ring.gif b/k9mail/src/main/assets/emoticons/ring.gif similarity index 100% rename from assets/emoticons/ring.gif rename to k9mail/src/main/assets/emoticons/ring.gif diff --git a/assets/emoticons/rock.gif b/k9mail/src/main/assets/emoticons/rock.gif similarity index 100% rename from assets/emoticons/rock.gif rename to k9mail/src/main/assets/emoticons/rock.gif diff --git a/assets/emoticons/rouge.gif b/k9mail/src/main/assets/emoticons/rouge.gif similarity index 100% rename from assets/emoticons/rouge.gif rename to k9mail/src/main/assets/emoticons/rouge.gif diff --git a/assets/emoticons/run.gif b/k9mail/src/main/assets/emoticons/run.gif similarity index 100% rename from assets/emoticons/run.gif rename to k9mail/src/main/assets/emoticons/run.gif diff --git a/assets/emoticons/rvcar.gif b/k9mail/src/main/assets/emoticons/rvcar.gif similarity index 100% rename from assets/emoticons/rvcar.gif rename to k9mail/src/main/assets/emoticons/rvcar.gif diff --git a/assets/emoticons/sad.gif b/k9mail/src/main/assets/emoticons/sad.gif similarity index 100% rename from assets/emoticons/sad.gif rename to k9mail/src/main/assets/emoticons/sad.gif diff --git a/assets/emoticons/sagittarius.gif b/k9mail/src/main/assets/emoticons/sagittarius.gif similarity index 100% rename from assets/emoticons/sagittarius.gif rename to k9mail/src/main/assets/emoticons/sagittarius.gif diff --git a/assets/emoticons/sandclock.gif b/k9mail/src/main/assets/emoticons/sandclock.gif similarity index 100% rename from assets/emoticons/sandclock.gif rename to k9mail/src/main/assets/emoticons/sandclock.gif diff --git a/assets/emoticons/school.gif b/k9mail/src/main/assets/emoticons/school.gif similarity index 100% rename from assets/emoticons/school.gif rename to k9mail/src/main/assets/emoticons/school.gif diff --git a/assets/emoticons/scissors.gif b/k9mail/src/main/assets/emoticons/scissors.gif similarity index 100% rename from assets/emoticons/scissors.gif rename to k9mail/src/main/assets/emoticons/scissors.gif diff --git a/assets/emoticons/scorpius.gif b/k9mail/src/main/assets/emoticons/scorpius.gif similarity index 100% rename from assets/emoticons/scorpius.gif rename to k9mail/src/main/assets/emoticons/scorpius.gif diff --git a/assets/emoticons/search.gif b/k9mail/src/main/assets/emoticons/search.gif similarity index 100% rename from assets/emoticons/search.gif rename to k9mail/src/main/assets/emoticons/search.gif diff --git a/assets/emoticons/secret.gif b/k9mail/src/main/assets/emoticons/secret.gif similarity index 100% rename from assets/emoticons/secret.gif rename to k9mail/src/main/assets/emoticons/secret.gif diff --git a/assets/emoticons/seven.gif b/k9mail/src/main/assets/emoticons/seven.gif similarity index 100% rename from assets/emoticons/seven.gif rename to k9mail/src/main/assets/emoticons/seven.gif diff --git a/assets/emoticons/shadow.gif b/k9mail/src/main/assets/emoticons/shadow.gif similarity index 100% rename from assets/emoticons/shadow.gif rename to k9mail/src/main/assets/emoticons/shadow.gif diff --git a/assets/emoticons/sharp.gif b/k9mail/src/main/assets/emoticons/sharp.gif similarity index 100% rename from assets/emoticons/sharp.gif rename to k9mail/src/main/assets/emoticons/sharp.gif diff --git a/assets/emoticons/shine.gif b/k9mail/src/main/assets/emoticons/shine.gif similarity index 100% rename from assets/emoticons/shine.gif rename to k9mail/src/main/assets/emoticons/shine.gif diff --git a/assets/emoticons/ship.gif b/k9mail/src/main/assets/emoticons/ship.gif similarity index 100% rename from assets/emoticons/ship.gif rename to k9mail/src/main/assets/emoticons/ship.gif diff --git a/assets/emoticons/shock.gif b/k9mail/src/main/assets/emoticons/shock.gif similarity index 100% rename from assets/emoticons/shock.gif rename to k9mail/src/main/assets/emoticons/shock.gif diff --git a/assets/emoticons/shoe.gif b/k9mail/src/main/assets/emoticons/shoe.gif similarity index 100% rename from assets/emoticons/shoe.gif rename to k9mail/src/main/assets/emoticons/shoe.gif diff --git a/assets/emoticons/sign01.gif b/k9mail/src/main/assets/emoticons/sign01.gif similarity index 100% rename from assets/emoticons/sign01.gif rename to k9mail/src/main/assets/emoticons/sign01.gif diff --git a/assets/emoticons/sign02.gif b/k9mail/src/main/assets/emoticons/sign02.gif similarity index 100% rename from assets/emoticons/sign02.gif rename to k9mail/src/main/assets/emoticons/sign02.gif diff --git a/assets/emoticons/sign03.gif b/k9mail/src/main/assets/emoticons/sign03.gif similarity index 100% rename from assets/emoticons/sign03.gif rename to k9mail/src/main/assets/emoticons/sign03.gif diff --git a/assets/emoticons/sign04.gif b/k9mail/src/main/assets/emoticons/sign04.gif similarity index 100% rename from assets/emoticons/sign04.gif rename to k9mail/src/main/assets/emoticons/sign04.gif diff --git a/assets/emoticons/sign05.gif b/k9mail/src/main/assets/emoticons/sign05.gif similarity index 100% rename from assets/emoticons/sign05.gif rename to k9mail/src/main/assets/emoticons/sign05.gif diff --git a/assets/emoticons/signaler.gif b/k9mail/src/main/assets/emoticons/signaler.gif similarity index 100% rename from assets/emoticons/signaler.gif rename to k9mail/src/main/assets/emoticons/signaler.gif diff --git a/assets/emoticons/six.gif b/k9mail/src/main/assets/emoticons/six.gif similarity index 100% rename from assets/emoticons/six.gif rename to k9mail/src/main/assets/emoticons/six.gif diff --git a/assets/emoticons/ski.gif b/k9mail/src/main/assets/emoticons/ski.gif similarity index 100% rename from assets/emoticons/ski.gif rename to k9mail/src/main/assets/emoticons/ski.gif diff --git a/assets/emoticons/slate.gif b/k9mail/src/main/assets/emoticons/slate.gif similarity index 100% rename from assets/emoticons/slate.gif rename to k9mail/src/main/assets/emoticons/slate.gif diff --git a/assets/emoticons/sleepy.gif b/k9mail/src/main/assets/emoticons/sleepy.gif similarity index 100% rename from assets/emoticons/sleepy.gif rename to k9mail/src/main/assets/emoticons/sleepy.gif diff --git a/assets/emoticons/smile.gif b/k9mail/src/main/assets/emoticons/smile.gif similarity index 100% rename from assets/emoticons/smile.gif rename to k9mail/src/main/assets/emoticons/smile.gif diff --git a/assets/emoticons/smoking.gif b/k9mail/src/main/assets/emoticons/smoking.gif similarity index 100% rename from assets/emoticons/smoking.gif rename to k9mail/src/main/assets/emoticons/smoking.gif diff --git a/assets/emoticons/snail.gif b/k9mail/src/main/assets/emoticons/snail.gif similarity index 100% rename from assets/emoticons/snail.gif rename to k9mail/src/main/assets/emoticons/snail.gif diff --git a/assets/emoticons/snow.gif b/k9mail/src/main/assets/emoticons/snow.gif similarity index 100% rename from assets/emoticons/snow.gif rename to k9mail/src/main/assets/emoticons/snow.gif diff --git a/assets/emoticons/snowboard.gif b/k9mail/src/main/assets/emoticons/snowboard.gif similarity index 100% rename from assets/emoticons/snowboard.gif rename to k9mail/src/main/assets/emoticons/snowboard.gif diff --git a/assets/emoticons/soccer.gif b/k9mail/src/main/assets/emoticons/soccer.gif similarity index 100% rename from assets/emoticons/soccer.gif rename to k9mail/src/main/assets/emoticons/soccer.gif diff --git a/assets/emoticons/soon.gif b/k9mail/src/main/assets/emoticons/soon.gif similarity index 100% rename from assets/emoticons/soon.gif rename to k9mail/src/main/assets/emoticons/soon.gif diff --git a/assets/emoticons/spa.gif b/k9mail/src/main/assets/emoticons/spa.gif similarity index 100% rename from assets/emoticons/spa.gif rename to k9mail/src/main/assets/emoticons/spa.gif diff --git a/assets/emoticons/spade.gif b/k9mail/src/main/assets/emoticons/spade.gif similarity index 100% rename from assets/emoticons/spade.gif rename to k9mail/src/main/assets/emoticons/spade.gif diff --git a/assets/emoticons/sports.gif b/k9mail/src/main/assets/emoticons/sports.gif similarity index 100% rename from assets/emoticons/sports.gif rename to k9mail/src/main/assets/emoticons/sports.gif diff --git a/assets/emoticons/sprinkle.gif b/k9mail/src/main/assets/emoticons/sprinkle.gif similarity index 100% rename from assets/emoticons/sprinkle.gif rename to k9mail/src/main/assets/emoticons/sprinkle.gif diff --git a/assets/emoticons/subway.gif b/k9mail/src/main/assets/emoticons/subway.gif similarity index 100% rename from assets/emoticons/subway.gif rename to k9mail/src/main/assets/emoticons/subway.gif diff --git a/assets/emoticons/sun.gif b/k9mail/src/main/assets/emoticons/sun.gif similarity index 100% rename from assets/emoticons/sun.gif rename to k9mail/src/main/assets/emoticons/sun.gif diff --git a/assets/emoticons/sweat01.gif b/k9mail/src/main/assets/emoticons/sweat01.gif similarity index 100% rename from assets/emoticons/sweat01.gif rename to k9mail/src/main/assets/emoticons/sweat01.gif diff --git a/assets/emoticons/sweat02.gif b/k9mail/src/main/assets/emoticons/sweat02.gif similarity index 100% rename from assets/emoticons/sweat02.gif rename to k9mail/src/main/assets/emoticons/sweat02.gif diff --git a/assets/emoticons/t-shirt.gif b/k9mail/src/main/assets/emoticons/t-shirt.gif similarity index 100% rename from assets/emoticons/t-shirt.gif rename to k9mail/src/main/assets/emoticons/t-shirt.gif diff --git a/assets/emoticons/taurus.gif b/k9mail/src/main/assets/emoticons/taurus.gif similarity index 100% rename from assets/emoticons/taurus.gif rename to k9mail/src/main/assets/emoticons/taurus.gif diff --git a/assets/emoticons/telephone.gif b/k9mail/src/main/assets/emoticons/telephone.gif similarity index 100% rename from assets/emoticons/telephone.gif rename to k9mail/src/main/assets/emoticons/telephone.gif diff --git a/assets/emoticons/tennis.gif b/k9mail/src/main/assets/emoticons/tennis.gif similarity index 100% rename from assets/emoticons/tennis.gif rename to k9mail/src/main/assets/emoticons/tennis.gif diff --git a/assets/emoticons/think.gif b/k9mail/src/main/assets/emoticons/think.gif similarity index 100% rename from assets/emoticons/think.gif rename to k9mail/src/main/assets/emoticons/think.gif diff --git a/assets/emoticons/three.gif b/k9mail/src/main/assets/emoticons/three.gif similarity index 100% rename from assets/emoticons/three.gif rename to k9mail/src/main/assets/emoticons/three.gif diff --git a/assets/emoticons/thunder.gif b/k9mail/src/main/assets/emoticons/thunder.gif similarity index 100% rename from assets/emoticons/thunder.gif rename to k9mail/src/main/assets/emoticons/thunder.gif diff --git a/assets/emoticons/ticket.gif b/k9mail/src/main/assets/emoticons/ticket.gif similarity index 100% rename from assets/emoticons/ticket.gif rename to k9mail/src/main/assets/emoticons/ticket.gif diff --git a/assets/emoticons/tm.gif b/k9mail/src/main/assets/emoticons/tm.gif similarity index 100% rename from assets/emoticons/tm.gif rename to k9mail/src/main/assets/emoticons/tm.gif diff --git a/assets/emoticons/toilet.gif b/k9mail/src/main/assets/emoticons/toilet.gif similarity index 100% rename from assets/emoticons/toilet.gif rename to k9mail/src/main/assets/emoticons/toilet.gif diff --git a/assets/emoticons/train.gif b/k9mail/src/main/assets/emoticons/train.gif similarity index 100% rename from assets/emoticons/train.gif rename to k9mail/src/main/assets/emoticons/train.gif diff --git a/assets/emoticons/tulip.gif b/k9mail/src/main/assets/emoticons/tulip.gif similarity index 100% rename from assets/emoticons/tulip.gif rename to k9mail/src/main/assets/emoticons/tulip.gif diff --git a/assets/emoticons/tv.gif b/k9mail/src/main/assets/emoticons/tv.gif similarity index 100% rename from assets/emoticons/tv.gif rename to k9mail/src/main/assets/emoticons/tv.gif diff --git a/assets/emoticons/two.gif b/k9mail/src/main/assets/emoticons/two.gif similarity index 100% rename from assets/emoticons/two.gif rename to k9mail/src/main/assets/emoticons/two.gif diff --git a/assets/emoticons/typhoon.gif b/k9mail/src/main/assets/emoticons/typhoon.gif similarity index 100% rename from assets/emoticons/typhoon.gif rename to k9mail/src/main/assets/emoticons/typhoon.gif diff --git a/assets/emoticons/up.gif b/k9mail/src/main/assets/emoticons/up.gif similarity index 100% rename from assets/emoticons/up.gif rename to k9mail/src/main/assets/emoticons/up.gif diff --git a/assets/emoticons/updown.gif b/k9mail/src/main/assets/emoticons/updown.gif similarity index 100% rename from assets/emoticons/updown.gif rename to k9mail/src/main/assets/emoticons/updown.gif diff --git a/assets/emoticons/upwardleft.gif b/k9mail/src/main/assets/emoticons/upwardleft.gif similarity index 100% rename from assets/emoticons/upwardleft.gif rename to k9mail/src/main/assets/emoticons/upwardleft.gif diff --git a/assets/emoticons/upwardright.gif b/k9mail/src/main/assets/emoticons/upwardright.gif similarity index 100% rename from assets/emoticons/upwardright.gif rename to k9mail/src/main/assets/emoticons/upwardright.gif diff --git a/assets/emoticons/virgo.gif b/k9mail/src/main/assets/emoticons/virgo.gif similarity index 100% rename from assets/emoticons/virgo.gif rename to k9mail/src/main/assets/emoticons/virgo.gif diff --git a/assets/emoticons/watch.gif b/k9mail/src/main/assets/emoticons/watch.gif similarity index 100% rename from assets/emoticons/watch.gif rename to k9mail/src/main/assets/emoticons/watch.gif diff --git a/assets/emoticons/wave.gif b/k9mail/src/main/assets/emoticons/wave.gif similarity index 100% rename from assets/emoticons/wave.gif rename to k9mail/src/main/assets/emoticons/wave.gif diff --git a/assets/emoticons/weep.gif b/k9mail/src/main/assets/emoticons/weep.gif similarity index 100% rename from assets/emoticons/weep.gif rename to k9mail/src/main/assets/emoticons/weep.gif diff --git a/assets/emoticons/wheelchair.gif b/k9mail/src/main/assets/emoticons/wheelchair.gif similarity index 100% rename from assets/emoticons/wheelchair.gif rename to k9mail/src/main/assets/emoticons/wheelchair.gif diff --git a/assets/emoticons/wine.gif b/k9mail/src/main/assets/emoticons/wine.gif similarity index 100% rename from assets/emoticons/wine.gif rename to k9mail/src/main/assets/emoticons/wine.gif diff --git a/assets/emoticons/wink.gif b/k9mail/src/main/assets/emoticons/wink.gif similarity index 100% rename from assets/emoticons/wink.gif rename to k9mail/src/main/assets/emoticons/wink.gif diff --git a/assets/emoticons/wobbly.gif b/k9mail/src/main/assets/emoticons/wobbly.gif similarity index 100% rename from assets/emoticons/wobbly.gif rename to k9mail/src/main/assets/emoticons/wobbly.gif diff --git a/assets/emoticons/wrench.gif b/k9mail/src/main/assets/emoticons/wrench.gif similarity index 100% rename from assets/emoticons/wrench.gif rename to k9mail/src/main/assets/emoticons/wrench.gif diff --git a/assets/emoticons/xmas.gif b/k9mail/src/main/assets/emoticons/xmas.gif similarity index 100% rename from assets/emoticons/xmas.gif rename to k9mail/src/main/assets/emoticons/xmas.gif diff --git a/assets/emoticons/yacht.gif b/k9mail/src/main/assets/emoticons/yacht.gif similarity index 100% rename from assets/emoticons/yacht.gif rename to k9mail/src/main/assets/emoticons/yacht.gif diff --git a/assets/emoticons/yen.gif b/k9mail/src/main/assets/emoticons/yen.gif similarity index 100% rename from assets/emoticons/yen.gif rename to k9mail/src/main/assets/emoticons/yen.gif diff --git a/assets/emoticons/zero.gif b/k9mail/src/main/assets/emoticons/zero.gif similarity index 100% rename from assets/emoticons/zero.gif rename to k9mail/src/main/assets/emoticons/zero.gif diff --git a/assets/icon.png b/k9mail/src/main/assets/icon.png similarity index 100% rename from assets/icon.png rename to k9mail/src/main/assets/icon.png diff --git a/assets/loading.gif b/k9mail/src/main/assets/loading.gif similarity index 100% rename from assets/loading.gif rename to k9mail/src/main/assets/loading.gif diff --git a/src/com/fsck/k9/Account.java b/k9mail/src/main/java/com/fsck/k9/Account.java similarity index 100% rename from src/com/fsck/k9/Account.java rename to k9mail/src/main/java/com/fsck/k9/Account.java diff --git a/src/com/fsck/k9/AccountStats.java b/k9mail/src/main/java/com/fsck/k9/AccountStats.java similarity index 100% rename from src/com/fsck/k9/AccountStats.java rename to k9mail/src/main/java/com/fsck/k9/AccountStats.java diff --git a/src/com/fsck/k9/BaseAccount.java b/k9mail/src/main/java/com/fsck/k9/BaseAccount.java similarity index 100% rename from src/com/fsck/k9/BaseAccount.java rename to k9mail/src/main/java/com/fsck/k9/BaseAccount.java diff --git a/src/com/fsck/k9/Clock.java b/k9mail/src/main/java/com/fsck/k9/Clock.java similarity index 100% rename from src/com/fsck/k9/Clock.java rename to k9mail/src/main/java/com/fsck/k9/Clock.java diff --git a/src/com/fsck/k9/EmailAddressAdapter.java b/k9mail/src/main/java/com/fsck/k9/EmailAddressAdapter.java similarity index 100% rename from src/com/fsck/k9/EmailAddressAdapter.java rename to k9mail/src/main/java/com/fsck/k9/EmailAddressAdapter.java diff --git a/src/com/fsck/k9/EmailAddressValidator.java b/k9mail/src/main/java/com/fsck/k9/EmailAddressValidator.java similarity index 100% rename from src/com/fsck/k9/EmailAddressValidator.java rename to k9mail/src/main/java/com/fsck/k9/EmailAddressValidator.java diff --git a/src/com/fsck/k9/FontSizes.java b/k9mail/src/main/java/com/fsck/k9/FontSizes.java similarity index 100% rename from src/com/fsck/k9/FontSizes.java rename to k9mail/src/main/java/com/fsck/k9/FontSizes.java diff --git a/src/com/fsck/k9/Identity.java b/k9mail/src/main/java/com/fsck/k9/Identity.java similarity index 100% rename from src/com/fsck/k9/Identity.java rename to k9mail/src/main/java/com/fsck/k9/Identity.java diff --git a/src/com/fsck/k9/K9.java b/k9mail/src/main/java/com/fsck/k9/K9.java similarity index 100% rename from src/com/fsck/k9/K9.java rename to k9mail/src/main/java/com/fsck/k9/K9.java diff --git a/src/com/fsck/k9/NotificationSetting.java b/k9mail/src/main/java/com/fsck/k9/NotificationSetting.java similarity index 100% rename from src/com/fsck/k9/NotificationSetting.java rename to k9mail/src/main/java/com/fsck/k9/NotificationSetting.java diff --git a/src/com/fsck/k9/PRNGFixes.java b/k9mail/src/main/java/com/fsck/k9/PRNGFixes.java similarity index 100% rename from src/com/fsck/k9/PRNGFixes.java rename to k9mail/src/main/java/com/fsck/k9/PRNGFixes.java diff --git a/src/com/fsck/k9/Preferences.java b/k9mail/src/main/java/com/fsck/k9/Preferences.java similarity index 100% rename from src/com/fsck/k9/Preferences.java rename to k9mail/src/main/java/com/fsck/k9/Preferences.java diff --git a/src/com/fsck/k9/Throttle.java b/k9mail/src/main/java/com/fsck/k9/Throttle.java similarity index 100% rename from src/com/fsck/k9/Throttle.java rename to k9mail/src/main/java/com/fsck/k9/Throttle.java diff --git a/src/com/fsck/k9/activity/AccountList.java b/k9mail/src/main/java/com/fsck/k9/activity/AccountList.java similarity index 100% rename from src/com/fsck/k9/activity/AccountList.java rename to k9mail/src/main/java/com/fsck/k9/activity/AccountList.java diff --git a/src/com/fsck/k9/activity/Accounts.java b/k9mail/src/main/java/com/fsck/k9/activity/Accounts.java similarity index 100% rename from src/com/fsck/k9/activity/Accounts.java rename to k9mail/src/main/java/com/fsck/k9/activity/Accounts.java diff --git a/src/com/fsck/k9/activity/ActivityListener.java b/k9mail/src/main/java/com/fsck/k9/activity/ActivityListener.java similarity index 100% rename from src/com/fsck/k9/activity/ActivityListener.java rename to k9mail/src/main/java/com/fsck/k9/activity/ActivityListener.java diff --git a/src/com/fsck/k9/activity/ChooseFolder.java b/k9mail/src/main/java/com/fsck/k9/activity/ChooseFolder.java similarity index 100% rename from src/com/fsck/k9/activity/ChooseFolder.java rename to k9mail/src/main/java/com/fsck/k9/activity/ChooseFolder.java diff --git a/src/com/fsck/k9/activity/ChooseIdentity.java b/k9mail/src/main/java/com/fsck/k9/activity/ChooseIdentity.java similarity index 100% rename from src/com/fsck/k9/activity/ChooseIdentity.java rename to k9mail/src/main/java/com/fsck/k9/activity/ChooseIdentity.java diff --git a/src/com/fsck/k9/activity/ColorPickerDialog.java b/k9mail/src/main/java/com/fsck/k9/activity/ColorPickerDialog.java similarity index 100% rename from src/com/fsck/k9/activity/ColorPickerDialog.java rename to k9mail/src/main/java/com/fsck/k9/activity/ColorPickerDialog.java diff --git a/src/com/fsck/k9/activity/ConfirmationDialog.java b/k9mail/src/main/java/com/fsck/k9/activity/ConfirmationDialog.java similarity index 100% rename from src/com/fsck/k9/activity/ConfirmationDialog.java rename to k9mail/src/main/java/com/fsck/k9/activity/ConfirmationDialog.java diff --git a/src/com/fsck/k9/activity/EditIdentity.java b/k9mail/src/main/java/com/fsck/k9/activity/EditIdentity.java similarity index 100% rename from src/com/fsck/k9/activity/EditIdentity.java rename to k9mail/src/main/java/com/fsck/k9/activity/EditIdentity.java diff --git a/src/com/fsck/k9/activity/EmailAddressList.java b/k9mail/src/main/java/com/fsck/k9/activity/EmailAddressList.java similarity index 100% rename from src/com/fsck/k9/activity/EmailAddressList.java rename to k9mail/src/main/java/com/fsck/k9/activity/EmailAddressList.java diff --git a/src/com/fsck/k9/activity/FolderInfoHolder.java b/k9mail/src/main/java/com/fsck/k9/activity/FolderInfoHolder.java similarity index 100% rename from src/com/fsck/k9/activity/FolderInfoHolder.java rename to k9mail/src/main/java/com/fsck/k9/activity/FolderInfoHolder.java diff --git a/src/com/fsck/k9/activity/FolderList.java b/k9mail/src/main/java/com/fsck/k9/activity/FolderList.java similarity index 100% rename from src/com/fsck/k9/activity/FolderList.java rename to k9mail/src/main/java/com/fsck/k9/activity/FolderList.java diff --git a/src/com/fsck/k9/activity/FolderListFilter.java b/k9mail/src/main/java/com/fsck/k9/activity/FolderListFilter.java similarity index 100% rename from src/com/fsck/k9/activity/FolderListFilter.java rename to k9mail/src/main/java/com/fsck/k9/activity/FolderListFilter.java diff --git a/src/com/fsck/k9/activity/InsertableHtmlContent.java b/k9mail/src/main/java/com/fsck/k9/activity/InsertableHtmlContent.java similarity index 100% rename from src/com/fsck/k9/activity/InsertableHtmlContent.java rename to k9mail/src/main/java/com/fsck/k9/activity/InsertableHtmlContent.java diff --git a/src/com/fsck/k9/activity/K9Activity.java b/k9mail/src/main/java/com/fsck/k9/activity/K9Activity.java similarity index 100% rename from src/com/fsck/k9/activity/K9Activity.java rename to k9mail/src/main/java/com/fsck/k9/activity/K9Activity.java diff --git a/src/com/fsck/k9/activity/K9ActivityCommon.java b/k9mail/src/main/java/com/fsck/k9/activity/K9ActivityCommon.java similarity index 100% rename from src/com/fsck/k9/activity/K9ActivityCommon.java rename to k9mail/src/main/java/com/fsck/k9/activity/K9ActivityCommon.java diff --git a/src/com/fsck/k9/activity/K9ListActivity.java b/k9mail/src/main/java/com/fsck/k9/activity/K9ListActivity.java similarity index 100% rename from src/com/fsck/k9/activity/K9ListActivity.java rename to k9mail/src/main/java/com/fsck/k9/activity/K9ListActivity.java diff --git a/src/com/fsck/k9/activity/K9PreferenceActivity.java b/k9mail/src/main/java/com/fsck/k9/activity/K9PreferenceActivity.java similarity index 100% rename from src/com/fsck/k9/activity/K9PreferenceActivity.java rename to k9mail/src/main/java/com/fsck/k9/activity/K9PreferenceActivity.java diff --git a/src/com/fsck/k9/activity/LauncherShortcuts.java b/k9mail/src/main/java/com/fsck/k9/activity/LauncherShortcuts.java similarity index 100% rename from src/com/fsck/k9/activity/LauncherShortcuts.java rename to k9mail/src/main/java/com/fsck/k9/activity/LauncherShortcuts.java diff --git a/src/com/fsck/k9/activity/ManageIdentities.java b/k9mail/src/main/java/com/fsck/k9/activity/ManageIdentities.java similarity index 100% rename from src/com/fsck/k9/activity/ManageIdentities.java rename to k9mail/src/main/java/com/fsck/k9/activity/ManageIdentities.java diff --git a/src/com/fsck/k9/activity/MessageCompose.java b/k9mail/src/main/java/com/fsck/k9/activity/MessageCompose.java similarity index 100% rename from src/com/fsck/k9/activity/MessageCompose.java rename to k9mail/src/main/java/com/fsck/k9/activity/MessageCompose.java diff --git a/src/com/fsck/k9/activity/MessageInfoHolder.java b/k9mail/src/main/java/com/fsck/k9/activity/MessageInfoHolder.java similarity index 100% rename from src/com/fsck/k9/activity/MessageInfoHolder.java rename to k9mail/src/main/java/com/fsck/k9/activity/MessageInfoHolder.java diff --git a/src/com/fsck/k9/activity/MessageList.java b/k9mail/src/main/java/com/fsck/k9/activity/MessageList.java similarity index 100% rename from src/com/fsck/k9/activity/MessageList.java rename to k9mail/src/main/java/com/fsck/k9/activity/MessageList.java diff --git a/src/com/fsck/k9/activity/MessageReference.java b/k9mail/src/main/java/com/fsck/k9/activity/MessageReference.java similarity index 100% rename from src/com/fsck/k9/activity/MessageReference.java rename to k9mail/src/main/java/com/fsck/k9/activity/MessageReference.java diff --git a/src/com/fsck/k9/activity/NotificationDeleteConfirmation.java b/k9mail/src/main/java/com/fsck/k9/activity/NotificationDeleteConfirmation.java similarity index 100% rename from src/com/fsck/k9/activity/NotificationDeleteConfirmation.java rename to k9mail/src/main/java/com/fsck/k9/activity/NotificationDeleteConfirmation.java diff --git a/src/com/fsck/k9/activity/Search.java b/k9mail/src/main/java/com/fsck/k9/activity/Search.java similarity index 100% rename from src/com/fsck/k9/activity/Search.java rename to k9mail/src/main/java/com/fsck/k9/activity/Search.java diff --git a/src/com/fsck/k9/activity/TextBodyBuilder.java b/k9mail/src/main/java/com/fsck/k9/activity/TextBodyBuilder.java similarity index 100% rename from src/com/fsck/k9/activity/TextBodyBuilder.java rename to k9mail/src/main/java/com/fsck/k9/activity/TextBodyBuilder.java diff --git a/src/com/fsck/k9/activity/UnreadWidgetConfiguration.java b/k9mail/src/main/java/com/fsck/k9/activity/UnreadWidgetConfiguration.java similarity index 100% rename from src/com/fsck/k9/activity/UnreadWidgetConfiguration.java rename to k9mail/src/main/java/com/fsck/k9/activity/UnreadWidgetConfiguration.java diff --git a/src/com/fsck/k9/activity/UpgradeDatabases.java b/k9mail/src/main/java/com/fsck/k9/activity/UpgradeDatabases.java similarity index 100% rename from src/com/fsck/k9/activity/UpgradeDatabases.java rename to k9mail/src/main/java/com/fsck/k9/activity/UpgradeDatabases.java diff --git a/src/com/fsck/k9/activity/loader/AttachmentContentLoader.java b/k9mail/src/main/java/com/fsck/k9/activity/loader/AttachmentContentLoader.java similarity index 100% rename from src/com/fsck/k9/activity/loader/AttachmentContentLoader.java rename to k9mail/src/main/java/com/fsck/k9/activity/loader/AttachmentContentLoader.java diff --git a/src/com/fsck/k9/activity/loader/AttachmentInfoLoader.java b/k9mail/src/main/java/com/fsck/k9/activity/loader/AttachmentInfoLoader.java similarity index 100% rename from src/com/fsck/k9/activity/loader/AttachmentInfoLoader.java rename to k9mail/src/main/java/com/fsck/k9/activity/loader/AttachmentInfoLoader.java diff --git a/src/com/fsck/k9/activity/misc/Attachment.java b/k9mail/src/main/java/com/fsck/k9/activity/misc/Attachment.java similarity index 100% rename from src/com/fsck/k9/activity/misc/Attachment.java rename to k9mail/src/main/java/com/fsck/k9/activity/misc/Attachment.java diff --git a/src/com/fsck/k9/activity/misc/ContactPictureLoader.java b/k9mail/src/main/java/com/fsck/k9/activity/misc/ContactPictureLoader.java similarity index 100% rename from src/com/fsck/k9/activity/misc/ContactPictureLoader.java rename to k9mail/src/main/java/com/fsck/k9/activity/misc/ContactPictureLoader.java diff --git a/src/com/fsck/k9/activity/misc/ExtendedAsyncTask.java b/k9mail/src/main/java/com/fsck/k9/activity/misc/ExtendedAsyncTask.java similarity index 100% rename from src/com/fsck/k9/activity/misc/ExtendedAsyncTask.java rename to k9mail/src/main/java/com/fsck/k9/activity/misc/ExtendedAsyncTask.java diff --git a/src/com/fsck/k9/activity/misc/NonConfigurationInstance.java b/k9mail/src/main/java/com/fsck/k9/activity/misc/NonConfigurationInstance.java similarity index 100% rename from src/com/fsck/k9/activity/misc/NonConfigurationInstance.java rename to k9mail/src/main/java/com/fsck/k9/activity/misc/NonConfigurationInstance.java diff --git a/src/com/fsck/k9/activity/misc/SwipeGestureDetector.java b/k9mail/src/main/java/com/fsck/k9/activity/misc/SwipeGestureDetector.java similarity index 100% rename from src/com/fsck/k9/activity/misc/SwipeGestureDetector.java rename to k9mail/src/main/java/com/fsck/k9/activity/misc/SwipeGestureDetector.java diff --git a/src/com/fsck/k9/activity/setup/AccountSettings.java b/k9mail/src/main/java/com/fsck/k9/activity/setup/AccountSettings.java similarity index 100% rename from src/com/fsck/k9/activity/setup/AccountSettings.java rename to k9mail/src/main/java/com/fsck/k9/activity/setup/AccountSettings.java diff --git a/src/com/fsck/k9/activity/setup/AccountSetupAccountType.java b/k9mail/src/main/java/com/fsck/k9/activity/setup/AccountSetupAccountType.java similarity index 100% rename from src/com/fsck/k9/activity/setup/AccountSetupAccountType.java rename to k9mail/src/main/java/com/fsck/k9/activity/setup/AccountSetupAccountType.java diff --git a/src/com/fsck/k9/activity/setup/AccountSetupBasics.java b/k9mail/src/main/java/com/fsck/k9/activity/setup/AccountSetupBasics.java similarity index 100% rename from src/com/fsck/k9/activity/setup/AccountSetupBasics.java rename to k9mail/src/main/java/com/fsck/k9/activity/setup/AccountSetupBasics.java diff --git a/src/com/fsck/k9/activity/setup/AccountSetupCheckSettings.java b/k9mail/src/main/java/com/fsck/k9/activity/setup/AccountSetupCheckSettings.java similarity index 100% rename from src/com/fsck/k9/activity/setup/AccountSetupCheckSettings.java rename to k9mail/src/main/java/com/fsck/k9/activity/setup/AccountSetupCheckSettings.java diff --git a/src/com/fsck/k9/activity/setup/AccountSetupComposition.java b/k9mail/src/main/java/com/fsck/k9/activity/setup/AccountSetupComposition.java similarity index 100% rename from src/com/fsck/k9/activity/setup/AccountSetupComposition.java rename to k9mail/src/main/java/com/fsck/k9/activity/setup/AccountSetupComposition.java diff --git a/src/com/fsck/k9/activity/setup/AccountSetupIncoming.java b/k9mail/src/main/java/com/fsck/k9/activity/setup/AccountSetupIncoming.java similarity index 100% rename from src/com/fsck/k9/activity/setup/AccountSetupIncoming.java rename to k9mail/src/main/java/com/fsck/k9/activity/setup/AccountSetupIncoming.java diff --git a/src/com/fsck/k9/activity/setup/AccountSetupNames.java b/k9mail/src/main/java/com/fsck/k9/activity/setup/AccountSetupNames.java similarity index 100% rename from src/com/fsck/k9/activity/setup/AccountSetupNames.java rename to k9mail/src/main/java/com/fsck/k9/activity/setup/AccountSetupNames.java diff --git a/src/com/fsck/k9/activity/setup/AccountSetupOptions.java b/k9mail/src/main/java/com/fsck/k9/activity/setup/AccountSetupOptions.java similarity index 100% rename from src/com/fsck/k9/activity/setup/AccountSetupOptions.java rename to k9mail/src/main/java/com/fsck/k9/activity/setup/AccountSetupOptions.java diff --git a/src/com/fsck/k9/activity/setup/AccountSetupOutgoing.java b/k9mail/src/main/java/com/fsck/k9/activity/setup/AccountSetupOutgoing.java similarity index 100% rename from src/com/fsck/k9/activity/setup/AccountSetupOutgoing.java rename to k9mail/src/main/java/com/fsck/k9/activity/setup/AccountSetupOutgoing.java diff --git a/src/com/fsck/k9/activity/setup/AuthTypeAdapter.java b/k9mail/src/main/java/com/fsck/k9/activity/setup/AuthTypeAdapter.java similarity index 100% rename from src/com/fsck/k9/activity/setup/AuthTypeAdapter.java rename to k9mail/src/main/java/com/fsck/k9/activity/setup/AuthTypeAdapter.java diff --git a/src/com/fsck/k9/activity/setup/AuthTypeHolder.java b/k9mail/src/main/java/com/fsck/k9/activity/setup/AuthTypeHolder.java similarity index 100% rename from src/com/fsck/k9/activity/setup/AuthTypeHolder.java rename to k9mail/src/main/java/com/fsck/k9/activity/setup/AuthTypeHolder.java diff --git a/src/com/fsck/k9/activity/setup/ConnectionSecurityAdapter.java b/k9mail/src/main/java/com/fsck/k9/activity/setup/ConnectionSecurityAdapter.java similarity index 100% rename from src/com/fsck/k9/activity/setup/ConnectionSecurityAdapter.java rename to k9mail/src/main/java/com/fsck/k9/activity/setup/ConnectionSecurityAdapter.java diff --git a/src/com/fsck/k9/activity/setup/ConnectionSecurityHolder.java b/k9mail/src/main/java/com/fsck/k9/activity/setup/ConnectionSecurityHolder.java similarity index 100% rename from src/com/fsck/k9/activity/setup/ConnectionSecurityHolder.java rename to k9mail/src/main/java/com/fsck/k9/activity/setup/ConnectionSecurityHolder.java diff --git a/src/com/fsck/k9/activity/setup/FolderSettings.java b/k9mail/src/main/java/com/fsck/k9/activity/setup/FolderSettings.java similarity index 100% rename from src/com/fsck/k9/activity/setup/FolderSettings.java rename to k9mail/src/main/java/com/fsck/k9/activity/setup/FolderSettings.java diff --git a/src/com/fsck/k9/activity/setup/FontSizeSettings.java b/k9mail/src/main/java/com/fsck/k9/activity/setup/FontSizeSettings.java similarity index 100% rename from src/com/fsck/k9/activity/setup/FontSizeSettings.java rename to k9mail/src/main/java/com/fsck/k9/activity/setup/FontSizeSettings.java diff --git a/src/com/fsck/k9/activity/setup/Prefs.java b/k9mail/src/main/java/com/fsck/k9/activity/setup/Prefs.java similarity index 100% rename from src/com/fsck/k9/activity/setup/Prefs.java rename to k9mail/src/main/java/com/fsck/k9/activity/setup/Prefs.java diff --git a/src/com/fsck/k9/activity/setup/SliderPreference.java b/k9mail/src/main/java/com/fsck/k9/activity/setup/SliderPreference.java similarity index 100% rename from src/com/fsck/k9/activity/setup/SliderPreference.java rename to k9mail/src/main/java/com/fsck/k9/activity/setup/SliderPreference.java diff --git a/src/com/fsck/k9/activity/setup/SpinnerOption.java b/k9mail/src/main/java/com/fsck/k9/activity/setup/SpinnerOption.java similarity index 100% rename from src/com/fsck/k9/activity/setup/SpinnerOption.java rename to k9mail/src/main/java/com/fsck/k9/activity/setup/SpinnerOption.java diff --git a/src/com/fsck/k9/activity/setup/WelcomeMessage.java b/k9mail/src/main/java/com/fsck/k9/activity/setup/WelcomeMessage.java similarity index 100% rename from src/com/fsck/k9/activity/setup/WelcomeMessage.java rename to k9mail/src/main/java/com/fsck/k9/activity/setup/WelcomeMessage.java diff --git a/src/com/fsck/k9/cache/EmailProviderCache.java b/k9mail/src/main/java/com/fsck/k9/cache/EmailProviderCache.java similarity index 100% rename from src/com/fsck/k9/cache/EmailProviderCache.java rename to k9mail/src/main/java/com/fsck/k9/cache/EmailProviderCache.java diff --git a/src/com/fsck/k9/cache/EmailProviderCacheCursor.java b/k9mail/src/main/java/com/fsck/k9/cache/EmailProviderCacheCursor.java similarity index 100% rename from src/com/fsck/k9/cache/EmailProviderCacheCursor.java rename to k9mail/src/main/java/com/fsck/k9/cache/EmailProviderCacheCursor.java diff --git a/src/com/fsck/k9/cache/TemporaryAttachmentStore.java b/k9mail/src/main/java/com/fsck/k9/cache/TemporaryAttachmentStore.java similarity index 100% rename from src/com/fsck/k9/cache/TemporaryAttachmentStore.java rename to k9mail/src/main/java/com/fsck/k9/cache/TemporaryAttachmentStore.java diff --git a/src/com/fsck/k9/controller/MessagingController.java b/k9mail/src/main/java/com/fsck/k9/controller/MessagingController.java similarity index 100% rename from src/com/fsck/k9/controller/MessagingController.java rename to k9mail/src/main/java/com/fsck/k9/controller/MessagingController.java diff --git a/src/com/fsck/k9/controller/MessagingControllerPushReceiver.java b/k9mail/src/main/java/com/fsck/k9/controller/MessagingControllerPushReceiver.java similarity index 100% rename from src/com/fsck/k9/controller/MessagingControllerPushReceiver.java rename to k9mail/src/main/java/com/fsck/k9/controller/MessagingControllerPushReceiver.java diff --git a/src/com/fsck/k9/controller/MessagingListener.java b/k9mail/src/main/java/com/fsck/k9/controller/MessagingListener.java similarity index 100% rename from src/com/fsck/k9/controller/MessagingListener.java rename to k9mail/src/main/java/com/fsck/k9/controller/MessagingListener.java diff --git a/src/com/fsck/k9/controller/UnavailableAccountException.java b/k9mail/src/main/java/com/fsck/k9/controller/UnavailableAccountException.java similarity index 100% rename from src/com/fsck/k9/controller/UnavailableAccountException.java rename to k9mail/src/main/java/com/fsck/k9/controller/UnavailableAccountException.java diff --git a/src/com/fsck/k9/crypto/CryptoHelper.java b/k9mail/src/main/java/com/fsck/k9/crypto/CryptoHelper.java similarity index 100% rename from src/com/fsck/k9/crypto/CryptoHelper.java rename to k9mail/src/main/java/com/fsck/k9/crypto/CryptoHelper.java diff --git a/src/com/fsck/k9/crypto/OpenPgpApiHelper.java b/k9mail/src/main/java/com/fsck/k9/crypto/OpenPgpApiHelper.java similarity index 100% rename from src/com/fsck/k9/crypto/OpenPgpApiHelper.java rename to k9mail/src/main/java/com/fsck/k9/crypto/OpenPgpApiHelper.java diff --git a/src/com/fsck/k9/crypto/PgpData.java b/k9mail/src/main/java/com/fsck/k9/crypto/PgpData.java similarity index 100% rename from src/com/fsck/k9/crypto/PgpData.java rename to k9mail/src/main/java/com/fsck/k9/crypto/PgpData.java diff --git a/src/com/fsck/k9/fragment/ConfirmationDialogFragment.java b/k9mail/src/main/java/com/fsck/k9/fragment/ConfirmationDialogFragment.java similarity index 100% rename from src/com/fsck/k9/fragment/ConfirmationDialogFragment.java rename to k9mail/src/main/java/com/fsck/k9/fragment/ConfirmationDialogFragment.java diff --git a/src/com/fsck/k9/fragment/MessageListFragment.java b/k9mail/src/main/java/com/fsck/k9/fragment/MessageListFragment.java similarity index 100% rename from src/com/fsck/k9/fragment/MessageListFragment.java rename to k9mail/src/main/java/com/fsck/k9/fragment/MessageListFragment.java diff --git a/src/com/fsck/k9/fragment/MessageViewFragment.java b/k9mail/src/main/java/com/fsck/k9/fragment/MessageViewFragment.java similarity index 100% rename from src/com/fsck/k9/fragment/MessageViewFragment.java rename to k9mail/src/main/java/com/fsck/k9/fragment/MessageViewFragment.java diff --git a/src/com/fsck/k9/fragment/ProgressDialogFragment.java b/k9mail/src/main/java/com/fsck/k9/fragment/ProgressDialogFragment.java similarity index 100% rename from src/com/fsck/k9/fragment/ProgressDialogFragment.java rename to k9mail/src/main/java/com/fsck/k9/fragment/ProgressDialogFragment.java diff --git a/src/com/fsck/k9/helper/ClipboardManager.java b/k9mail/src/main/java/com/fsck/k9/helper/ClipboardManager.java similarity index 100% rename from src/com/fsck/k9/helper/ClipboardManager.java rename to k9mail/src/main/java/com/fsck/k9/helper/ClipboardManager.java diff --git a/src/com/fsck/k9/helper/ContactItem.java b/k9mail/src/main/java/com/fsck/k9/helper/ContactItem.java similarity index 100% rename from src/com/fsck/k9/helper/ContactItem.java rename to k9mail/src/main/java/com/fsck/k9/helper/ContactItem.java diff --git a/src/com/fsck/k9/helper/ContactPicture.java b/k9mail/src/main/java/com/fsck/k9/helper/ContactPicture.java similarity index 100% rename from src/com/fsck/k9/helper/ContactPicture.java rename to k9mail/src/main/java/com/fsck/k9/helper/ContactPicture.java diff --git a/src/com/fsck/k9/helper/Contacts.java b/k9mail/src/main/java/com/fsck/k9/helper/Contacts.java similarity index 100% rename from src/com/fsck/k9/helper/Contacts.java rename to k9mail/src/main/java/com/fsck/k9/helper/Contacts.java diff --git a/src/com/fsck/k9/helper/FileBrowserHelper.java b/k9mail/src/main/java/com/fsck/k9/helper/FileBrowserHelper.java similarity index 100% rename from src/com/fsck/k9/helper/FileBrowserHelper.java rename to k9mail/src/main/java/com/fsck/k9/helper/FileBrowserHelper.java diff --git a/src/com/fsck/k9/helper/FileHelper.java b/k9mail/src/main/java/com/fsck/k9/helper/FileHelper.java similarity index 100% rename from src/com/fsck/k9/helper/FileHelper.java rename to k9mail/src/main/java/com/fsck/k9/helper/FileHelper.java diff --git a/src/com/fsck/k9/helper/HtmlConverter.java b/k9mail/src/main/java/com/fsck/k9/helper/HtmlConverter.java similarity index 100% rename from src/com/fsck/k9/helper/HtmlConverter.java rename to k9mail/src/main/java/com/fsck/k9/helper/HtmlConverter.java diff --git a/src/com/fsck/k9/helper/IdentityHelper.java b/k9mail/src/main/java/com/fsck/k9/helper/IdentityHelper.java similarity index 100% rename from src/com/fsck/k9/helper/IdentityHelper.java rename to k9mail/src/main/java/com/fsck/k9/helper/IdentityHelper.java diff --git a/src/com/fsck/k9/helper/MediaScannerNotifier.java b/k9mail/src/main/java/com/fsck/k9/helper/MediaScannerNotifier.java similarity index 100% rename from src/com/fsck/k9/helper/MediaScannerNotifier.java rename to k9mail/src/main/java/com/fsck/k9/helper/MediaScannerNotifier.java diff --git a/src/com/fsck/k9/helper/MergeCursor.java b/k9mail/src/main/java/com/fsck/k9/helper/MergeCursor.java similarity index 100% rename from src/com/fsck/k9/helper/MergeCursor.java rename to k9mail/src/main/java/com/fsck/k9/helper/MergeCursor.java diff --git a/src/com/fsck/k9/helper/MergeCursorWithUniqueId.java b/k9mail/src/main/java/com/fsck/k9/helper/MergeCursorWithUniqueId.java similarity index 100% rename from src/com/fsck/k9/helper/MergeCursorWithUniqueId.java rename to k9mail/src/main/java/com/fsck/k9/helper/MergeCursorWithUniqueId.java diff --git a/src/com/fsck/k9/helper/MessageHelper.java b/k9mail/src/main/java/com/fsck/k9/helper/MessageHelper.java similarity index 100% rename from src/com/fsck/k9/helper/MessageHelper.java rename to k9mail/src/main/java/com/fsck/k9/helper/MessageHelper.java diff --git a/src/com/fsck/k9/helper/SizeFormatter.java b/k9mail/src/main/java/com/fsck/k9/helper/SizeFormatter.java similarity index 100% rename from src/com/fsck/k9/helper/SizeFormatter.java rename to k9mail/src/main/java/com/fsck/k9/helper/SizeFormatter.java diff --git a/src/com/fsck/k9/helper/UrlEncodingHelper.java b/k9mail/src/main/java/com/fsck/k9/helper/UrlEncodingHelper.java similarity index 100% rename from src/com/fsck/k9/helper/UrlEncodingHelper.java rename to k9mail/src/main/java/com/fsck/k9/helper/UrlEncodingHelper.java diff --git a/src/com/fsck/k9/helper/Utility.java b/k9mail/src/main/java/com/fsck/k9/helper/Utility.java similarity index 100% rename from src/com/fsck/k9/helper/Utility.java rename to k9mail/src/main/java/com/fsck/k9/helper/Utility.java diff --git a/src/com/fsck/k9/helper/power/TracingPowerManager.java b/k9mail/src/main/java/com/fsck/k9/helper/power/TracingPowerManager.java similarity index 100% rename from src/com/fsck/k9/helper/power/TracingPowerManager.java rename to k9mail/src/main/java/com/fsck/k9/helper/power/TracingPowerManager.java diff --git a/src/com/fsck/k9/mail/Address.java b/k9mail/src/main/java/com/fsck/k9/mail/Address.java similarity index 100% rename from src/com/fsck/k9/mail/Address.java rename to k9mail/src/main/java/com/fsck/k9/mail/Address.java diff --git a/src/com/fsck/k9/mail/AuthType.java b/k9mail/src/main/java/com/fsck/k9/mail/AuthType.java similarity index 100% rename from src/com/fsck/k9/mail/AuthType.java rename to k9mail/src/main/java/com/fsck/k9/mail/AuthType.java diff --git a/src/com/fsck/k9/mail/Authentication.java b/k9mail/src/main/java/com/fsck/k9/mail/Authentication.java similarity index 100% rename from src/com/fsck/k9/mail/Authentication.java rename to k9mail/src/main/java/com/fsck/k9/mail/Authentication.java diff --git a/src/com/fsck/k9/mail/AuthenticationFailedException.java b/k9mail/src/main/java/com/fsck/k9/mail/AuthenticationFailedException.java similarity index 100% rename from src/com/fsck/k9/mail/AuthenticationFailedException.java rename to k9mail/src/main/java/com/fsck/k9/mail/AuthenticationFailedException.java diff --git a/src/com/fsck/k9/mail/Body.java b/k9mail/src/main/java/com/fsck/k9/mail/Body.java similarity index 100% rename from src/com/fsck/k9/mail/Body.java rename to k9mail/src/main/java/com/fsck/k9/mail/Body.java diff --git a/src/com/fsck/k9/mail/BodyPart.java b/k9mail/src/main/java/com/fsck/k9/mail/BodyPart.java similarity index 100% rename from src/com/fsck/k9/mail/BodyPart.java rename to k9mail/src/main/java/com/fsck/k9/mail/BodyPart.java diff --git a/src/com/fsck/k9/mail/CertificateChainException.java b/k9mail/src/main/java/com/fsck/k9/mail/CertificateChainException.java similarity index 100% rename from src/com/fsck/k9/mail/CertificateChainException.java rename to k9mail/src/main/java/com/fsck/k9/mail/CertificateChainException.java diff --git a/src/com/fsck/k9/mail/CertificateValidationException.java b/k9mail/src/main/java/com/fsck/k9/mail/CertificateValidationException.java similarity index 100% rename from src/com/fsck/k9/mail/CertificateValidationException.java rename to k9mail/src/main/java/com/fsck/k9/mail/CertificateValidationException.java diff --git a/src/com/fsck/k9/mail/CompositeBody.java b/k9mail/src/main/java/com/fsck/k9/mail/CompositeBody.java similarity index 100% rename from src/com/fsck/k9/mail/CompositeBody.java rename to k9mail/src/main/java/com/fsck/k9/mail/CompositeBody.java diff --git a/src/com/fsck/k9/mail/ConnectionSecurity.java b/k9mail/src/main/java/com/fsck/k9/mail/ConnectionSecurity.java similarity index 100% rename from src/com/fsck/k9/mail/ConnectionSecurity.java rename to k9mail/src/main/java/com/fsck/k9/mail/ConnectionSecurity.java diff --git a/src/com/fsck/k9/mail/FetchProfile.java b/k9mail/src/main/java/com/fsck/k9/mail/FetchProfile.java similarity index 100% rename from src/com/fsck/k9/mail/FetchProfile.java rename to k9mail/src/main/java/com/fsck/k9/mail/FetchProfile.java diff --git a/src/com/fsck/k9/mail/Flag.java b/k9mail/src/main/java/com/fsck/k9/mail/Flag.java similarity index 100% rename from src/com/fsck/k9/mail/Flag.java rename to k9mail/src/main/java/com/fsck/k9/mail/Flag.java diff --git a/src/com/fsck/k9/mail/Folder.java b/k9mail/src/main/java/com/fsck/k9/mail/Folder.java similarity index 100% rename from src/com/fsck/k9/mail/Folder.java rename to k9mail/src/main/java/com/fsck/k9/mail/Folder.java diff --git a/src/com/fsck/k9/mail/K9MailLib.java b/k9mail/src/main/java/com/fsck/k9/mail/K9MailLib.java similarity index 100% rename from src/com/fsck/k9/mail/K9MailLib.java rename to k9mail/src/main/java/com/fsck/k9/mail/K9MailLib.java diff --git a/src/com/fsck/k9/mail/Message.java b/k9mail/src/main/java/com/fsck/k9/mail/Message.java similarity index 100% rename from src/com/fsck/k9/mail/Message.java rename to k9mail/src/main/java/com/fsck/k9/mail/Message.java diff --git a/src/com/fsck/k9/mail/MessageRetrievalListener.java b/k9mail/src/main/java/com/fsck/k9/mail/MessageRetrievalListener.java similarity index 100% rename from src/com/fsck/k9/mail/MessageRetrievalListener.java rename to k9mail/src/main/java/com/fsck/k9/mail/MessageRetrievalListener.java diff --git a/src/com/fsck/k9/mail/MessagingException.java b/k9mail/src/main/java/com/fsck/k9/mail/MessagingException.java similarity index 100% rename from src/com/fsck/k9/mail/MessagingException.java rename to k9mail/src/main/java/com/fsck/k9/mail/MessagingException.java diff --git a/src/com/fsck/k9/mail/Multipart.java b/k9mail/src/main/java/com/fsck/k9/mail/Multipart.java similarity index 100% rename from src/com/fsck/k9/mail/Multipart.java rename to k9mail/src/main/java/com/fsck/k9/mail/Multipart.java diff --git a/src/com/fsck/k9/mail/Part.java b/k9mail/src/main/java/com/fsck/k9/mail/Part.java similarity index 100% rename from src/com/fsck/k9/mail/Part.java rename to k9mail/src/main/java/com/fsck/k9/mail/Part.java diff --git a/src/com/fsck/k9/mail/PushReceiver.java b/k9mail/src/main/java/com/fsck/k9/mail/PushReceiver.java similarity index 100% rename from src/com/fsck/k9/mail/PushReceiver.java rename to k9mail/src/main/java/com/fsck/k9/mail/PushReceiver.java diff --git a/src/com/fsck/k9/mail/Pusher.java b/k9mail/src/main/java/com/fsck/k9/mail/Pusher.java similarity index 100% rename from src/com/fsck/k9/mail/Pusher.java rename to k9mail/src/main/java/com/fsck/k9/mail/Pusher.java diff --git a/src/com/fsck/k9/mail/ServerSettings.java b/k9mail/src/main/java/com/fsck/k9/mail/ServerSettings.java similarity index 100% rename from src/com/fsck/k9/mail/ServerSettings.java rename to k9mail/src/main/java/com/fsck/k9/mail/ServerSettings.java diff --git a/src/com/fsck/k9/mail/Store.java b/k9mail/src/main/java/com/fsck/k9/mail/Store.java similarity index 100% rename from src/com/fsck/k9/mail/Store.java rename to k9mail/src/main/java/com/fsck/k9/mail/Store.java diff --git a/src/com/fsck/k9/mail/Transport.java b/k9mail/src/main/java/com/fsck/k9/mail/Transport.java similarity index 100% rename from src/com/fsck/k9/mail/Transport.java rename to k9mail/src/main/java/com/fsck/k9/mail/Transport.java diff --git a/src/com/fsck/k9/mail/filter/Base64.java b/k9mail/src/main/java/com/fsck/k9/mail/filter/Base64.java similarity index 100% rename from src/com/fsck/k9/mail/filter/Base64.java rename to k9mail/src/main/java/com/fsck/k9/mail/filter/Base64.java diff --git a/src/com/fsck/k9/mail/filter/Base64OutputStream.java b/k9mail/src/main/java/com/fsck/k9/mail/filter/Base64OutputStream.java similarity index 100% rename from src/com/fsck/k9/mail/filter/Base64OutputStream.java rename to k9mail/src/main/java/com/fsck/k9/mail/filter/Base64OutputStream.java diff --git a/src/com/fsck/k9/mail/filter/CountingOutputStream.java b/k9mail/src/main/java/com/fsck/k9/mail/filter/CountingOutputStream.java similarity index 100% rename from src/com/fsck/k9/mail/filter/CountingOutputStream.java rename to k9mail/src/main/java/com/fsck/k9/mail/filter/CountingOutputStream.java diff --git a/src/com/fsck/k9/mail/filter/EOLConvertingOutputStream.java b/k9mail/src/main/java/com/fsck/k9/mail/filter/EOLConvertingOutputStream.java similarity index 100% rename from src/com/fsck/k9/mail/filter/EOLConvertingOutputStream.java rename to k9mail/src/main/java/com/fsck/k9/mail/filter/EOLConvertingOutputStream.java diff --git a/src/com/fsck/k9/mail/filter/FixedLengthInputStream.java b/k9mail/src/main/java/com/fsck/k9/mail/filter/FixedLengthInputStream.java similarity index 100% rename from src/com/fsck/k9/mail/filter/FixedLengthInputStream.java rename to k9mail/src/main/java/com/fsck/k9/mail/filter/FixedLengthInputStream.java diff --git a/src/com/fsck/k9/mail/filter/Hex.java b/k9mail/src/main/java/com/fsck/k9/mail/filter/Hex.java similarity index 100% rename from src/com/fsck/k9/mail/filter/Hex.java rename to k9mail/src/main/java/com/fsck/k9/mail/filter/Hex.java diff --git a/src/com/fsck/k9/mail/filter/LineWrapOutputStream.java b/k9mail/src/main/java/com/fsck/k9/mail/filter/LineWrapOutputStream.java similarity index 100% rename from src/com/fsck/k9/mail/filter/LineWrapOutputStream.java rename to k9mail/src/main/java/com/fsck/k9/mail/filter/LineWrapOutputStream.java diff --git a/src/com/fsck/k9/mail/filter/PeekableInputStream.java b/k9mail/src/main/java/com/fsck/k9/mail/filter/PeekableInputStream.java similarity index 100% rename from src/com/fsck/k9/mail/filter/PeekableInputStream.java rename to k9mail/src/main/java/com/fsck/k9/mail/filter/PeekableInputStream.java diff --git a/src/com/fsck/k9/mail/filter/SmtpDataStuffing.java b/k9mail/src/main/java/com/fsck/k9/mail/filter/SmtpDataStuffing.java similarity index 100% rename from src/com/fsck/k9/mail/filter/SmtpDataStuffing.java rename to k9mail/src/main/java/com/fsck/k9/mail/filter/SmtpDataStuffing.java diff --git a/src/com/fsck/k9/mail/internet/BinaryTempFileBody.java b/k9mail/src/main/java/com/fsck/k9/mail/internet/BinaryTempFileBody.java similarity index 100% rename from src/com/fsck/k9/mail/internet/BinaryTempFileBody.java rename to k9mail/src/main/java/com/fsck/k9/mail/internet/BinaryTempFileBody.java diff --git a/src/com/fsck/k9/mail/internet/BinaryTempFileMessageBody.java b/k9mail/src/main/java/com/fsck/k9/mail/internet/BinaryTempFileMessageBody.java similarity index 100% rename from src/com/fsck/k9/mail/internet/BinaryTempFileMessageBody.java rename to k9mail/src/main/java/com/fsck/k9/mail/internet/BinaryTempFileMessageBody.java diff --git a/src/com/fsck/k9/mail/internet/CharsetSupport.java b/k9mail/src/main/java/com/fsck/k9/mail/internet/CharsetSupport.java similarity index 100% rename from src/com/fsck/k9/mail/internet/CharsetSupport.java rename to k9mail/src/main/java/com/fsck/k9/mail/internet/CharsetSupport.java diff --git a/src/com/fsck/k9/mail/internet/DecoderUtil.java b/k9mail/src/main/java/com/fsck/k9/mail/internet/DecoderUtil.java similarity index 100% rename from src/com/fsck/k9/mail/internet/DecoderUtil.java rename to k9mail/src/main/java/com/fsck/k9/mail/internet/DecoderUtil.java diff --git a/src/com/fsck/k9/mail/internet/EncoderUtil.java b/k9mail/src/main/java/com/fsck/k9/mail/internet/EncoderUtil.java similarity index 100% rename from src/com/fsck/k9/mail/internet/EncoderUtil.java rename to k9mail/src/main/java/com/fsck/k9/mail/internet/EncoderUtil.java diff --git a/src/com/fsck/k9/mail/internet/Iso2022JpToShiftJisInputStream.java b/k9mail/src/main/java/com/fsck/k9/mail/internet/Iso2022JpToShiftJisInputStream.java similarity index 100% rename from src/com/fsck/k9/mail/internet/Iso2022JpToShiftJisInputStream.java rename to k9mail/src/main/java/com/fsck/k9/mail/internet/Iso2022JpToShiftJisInputStream.java diff --git a/src/com/fsck/k9/mail/internet/JisSupport.java b/k9mail/src/main/java/com/fsck/k9/mail/internet/JisSupport.java similarity index 100% rename from src/com/fsck/k9/mail/internet/JisSupport.java rename to k9mail/src/main/java/com/fsck/k9/mail/internet/JisSupport.java diff --git a/src/com/fsck/k9/mail/internet/MessageExtractor.java b/k9mail/src/main/java/com/fsck/k9/mail/internet/MessageExtractor.java similarity index 100% rename from src/com/fsck/k9/mail/internet/MessageExtractor.java rename to k9mail/src/main/java/com/fsck/k9/mail/internet/MessageExtractor.java diff --git a/src/com/fsck/k9/mail/internet/MimeBodyPart.java b/k9mail/src/main/java/com/fsck/k9/mail/internet/MimeBodyPart.java similarity index 100% rename from src/com/fsck/k9/mail/internet/MimeBodyPart.java rename to k9mail/src/main/java/com/fsck/k9/mail/internet/MimeBodyPart.java diff --git a/src/com/fsck/k9/mail/internet/MimeHeader.java b/k9mail/src/main/java/com/fsck/k9/mail/internet/MimeHeader.java similarity index 100% rename from src/com/fsck/k9/mail/internet/MimeHeader.java rename to k9mail/src/main/java/com/fsck/k9/mail/internet/MimeHeader.java diff --git a/src/com/fsck/k9/mail/internet/MimeMessage.java b/k9mail/src/main/java/com/fsck/k9/mail/internet/MimeMessage.java similarity index 100% rename from src/com/fsck/k9/mail/internet/MimeMessage.java rename to k9mail/src/main/java/com/fsck/k9/mail/internet/MimeMessage.java diff --git a/src/com/fsck/k9/mail/internet/MimeMultipart.java b/k9mail/src/main/java/com/fsck/k9/mail/internet/MimeMultipart.java similarity index 100% rename from src/com/fsck/k9/mail/internet/MimeMultipart.java rename to k9mail/src/main/java/com/fsck/k9/mail/internet/MimeMultipart.java diff --git a/src/com/fsck/k9/mail/internet/MimeUtility.java b/k9mail/src/main/java/com/fsck/k9/mail/internet/MimeUtility.java similarity index 100% rename from src/com/fsck/k9/mail/internet/MimeUtility.java rename to k9mail/src/main/java/com/fsck/k9/mail/internet/MimeUtility.java diff --git a/src/com/fsck/k9/mail/internet/TextBody.java b/k9mail/src/main/java/com/fsck/k9/mail/internet/TextBody.java similarity index 100% rename from src/com/fsck/k9/mail/internet/TextBody.java rename to k9mail/src/main/java/com/fsck/k9/mail/internet/TextBody.java diff --git a/src/com/fsck/k9/mail/internet/Viewable.java b/k9mail/src/main/java/com/fsck/k9/mail/internet/Viewable.java similarity index 100% rename from src/com/fsck/k9/mail/internet/Viewable.java rename to k9mail/src/main/java/com/fsck/k9/mail/internet/Viewable.java diff --git a/src/com/fsck/k9/mail/ssl/DefaultTrustedSocketFactory.java b/k9mail/src/main/java/com/fsck/k9/mail/ssl/DefaultTrustedSocketFactory.java similarity index 100% rename from src/com/fsck/k9/mail/ssl/DefaultTrustedSocketFactory.java rename to k9mail/src/main/java/com/fsck/k9/mail/ssl/DefaultTrustedSocketFactory.java diff --git a/src/com/fsck/k9/mail/ssl/KeyChainKeyManager.java b/k9mail/src/main/java/com/fsck/k9/mail/ssl/KeyChainKeyManager.java similarity index 100% rename from src/com/fsck/k9/mail/ssl/KeyChainKeyManager.java rename to k9mail/src/main/java/com/fsck/k9/mail/ssl/KeyChainKeyManager.java diff --git a/src/com/fsck/k9/mail/ssl/LocalKeyStore.java b/k9mail/src/main/java/com/fsck/k9/mail/ssl/LocalKeyStore.java similarity index 100% rename from src/com/fsck/k9/mail/ssl/LocalKeyStore.java rename to k9mail/src/main/java/com/fsck/k9/mail/ssl/LocalKeyStore.java diff --git a/src/com/fsck/k9/mail/ssl/TrustManagerFactory.java b/k9mail/src/main/java/com/fsck/k9/mail/ssl/TrustManagerFactory.java similarity index 100% rename from src/com/fsck/k9/mail/ssl/TrustManagerFactory.java rename to k9mail/src/main/java/com/fsck/k9/mail/ssl/TrustManagerFactory.java diff --git a/src/com/fsck/k9/mail/ssl/TrustedSocketFactory.java b/k9mail/src/main/java/com/fsck/k9/mail/ssl/TrustedSocketFactory.java similarity index 100% rename from src/com/fsck/k9/mail/ssl/TrustedSocketFactory.java rename to k9mail/src/main/java/com/fsck/k9/mail/ssl/TrustedSocketFactory.java diff --git a/src/com/fsck/k9/mail/store/RemoteStore.java b/k9mail/src/main/java/com/fsck/k9/mail/store/RemoteStore.java similarity index 100% rename from src/com/fsck/k9/mail/store/RemoteStore.java rename to k9mail/src/main/java/com/fsck/k9/mail/store/RemoteStore.java diff --git a/src/com/fsck/k9/mail/store/StoreConfig.java b/k9mail/src/main/java/com/fsck/k9/mail/store/StoreConfig.java similarity index 100% rename from src/com/fsck/k9/mail/store/StoreConfig.java rename to k9mail/src/main/java/com/fsck/k9/mail/store/StoreConfig.java diff --git a/src/com/fsck/k9/mail/store/imap/ImapCommands.java b/k9mail/src/main/java/com/fsck/k9/mail/store/imap/ImapCommands.java similarity index 100% rename from src/com/fsck/k9/mail/store/imap/ImapCommands.java rename to k9mail/src/main/java/com/fsck/k9/mail/store/imap/ImapCommands.java diff --git a/src/com/fsck/k9/mail/store/imap/ImapConnection.java b/k9mail/src/main/java/com/fsck/k9/mail/store/imap/ImapConnection.java similarity index 100% rename from src/com/fsck/k9/mail/store/imap/ImapConnection.java rename to k9mail/src/main/java/com/fsck/k9/mail/store/imap/ImapConnection.java diff --git a/src/com/fsck/k9/mail/store/imap/ImapException.java b/k9mail/src/main/java/com/fsck/k9/mail/store/imap/ImapException.java similarity index 100% rename from src/com/fsck/k9/mail/store/imap/ImapException.java rename to k9mail/src/main/java/com/fsck/k9/mail/store/imap/ImapException.java diff --git a/src/com/fsck/k9/mail/store/imap/ImapList.java b/k9mail/src/main/java/com/fsck/k9/mail/store/imap/ImapList.java similarity index 100% rename from src/com/fsck/k9/mail/store/imap/ImapList.java rename to k9mail/src/main/java/com/fsck/k9/mail/store/imap/ImapList.java diff --git a/src/com/fsck/k9/mail/store/imap/ImapResponse.java b/k9mail/src/main/java/com/fsck/k9/mail/store/imap/ImapResponse.java similarity index 100% rename from src/com/fsck/k9/mail/store/imap/ImapResponse.java rename to k9mail/src/main/java/com/fsck/k9/mail/store/imap/ImapResponse.java diff --git a/src/com/fsck/k9/mail/store/imap/ImapResponseCallback.java b/k9mail/src/main/java/com/fsck/k9/mail/store/imap/ImapResponseCallback.java similarity index 100% rename from src/com/fsck/k9/mail/store/imap/ImapResponseCallback.java rename to k9mail/src/main/java/com/fsck/k9/mail/store/imap/ImapResponseCallback.java diff --git a/src/com/fsck/k9/mail/store/imap/ImapResponseParser.java b/k9mail/src/main/java/com/fsck/k9/mail/store/imap/ImapResponseParser.java similarity index 100% rename from src/com/fsck/k9/mail/store/imap/ImapResponseParser.java rename to k9mail/src/main/java/com/fsck/k9/mail/store/imap/ImapResponseParser.java diff --git a/src/com/fsck/k9/mail/store/imap/ImapStore.java b/k9mail/src/main/java/com/fsck/k9/mail/store/imap/ImapStore.java similarity index 100% rename from src/com/fsck/k9/mail/store/imap/ImapStore.java rename to k9mail/src/main/java/com/fsck/k9/mail/store/imap/ImapStore.java diff --git a/src/com/fsck/k9/mail/store/imap/ImapUtility.java b/k9mail/src/main/java/com/fsck/k9/mail/store/imap/ImapUtility.java similarity index 100% rename from src/com/fsck/k9/mail/store/imap/ImapUtility.java rename to k9mail/src/main/java/com/fsck/k9/mail/store/imap/ImapUtility.java diff --git a/src/com/fsck/k9/mail/store/imap/UntaggedHandler.java b/k9mail/src/main/java/com/fsck/k9/mail/store/imap/UntaggedHandler.java similarity index 100% rename from src/com/fsck/k9/mail/store/imap/UntaggedHandler.java rename to k9mail/src/main/java/com/fsck/k9/mail/store/imap/UntaggedHandler.java diff --git a/src/com/fsck/k9/mail/store/pop3/Pop3Store.java b/k9mail/src/main/java/com/fsck/k9/mail/store/pop3/Pop3Store.java similarity index 100% rename from src/com/fsck/k9/mail/store/pop3/Pop3Store.java rename to k9mail/src/main/java/com/fsck/k9/mail/store/pop3/Pop3Store.java diff --git a/src/com/fsck/k9/mail/store/webdav/WebDavSocketFactory.java b/k9mail/src/main/java/com/fsck/k9/mail/store/webdav/WebDavSocketFactory.java similarity index 100% rename from src/com/fsck/k9/mail/store/webdav/WebDavSocketFactory.java rename to k9mail/src/main/java/com/fsck/k9/mail/store/webdav/WebDavSocketFactory.java diff --git a/src/com/fsck/k9/mail/store/webdav/WebDavStore.java b/k9mail/src/main/java/com/fsck/k9/mail/store/webdav/WebDavStore.java similarity index 100% rename from src/com/fsck/k9/mail/store/webdav/WebDavStore.java rename to k9mail/src/main/java/com/fsck/k9/mail/store/webdav/WebDavStore.java diff --git a/src/com/fsck/k9/mail/transport/SmtpTransport.java b/k9mail/src/main/java/com/fsck/k9/mail/transport/SmtpTransport.java similarity index 100% rename from src/com/fsck/k9/mail/transport/SmtpTransport.java rename to k9mail/src/main/java/com/fsck/k9/mail/transport/SmtpTransport.java diff --git a/src/com/fsck/k9/mail/transport/WebDavTransport.java b/k9mail/src/main/java/com/fsck/k9/mail/transport/WebDavTransport.java similarity index 100% rename from src/com/fsck/k9/mail/transport/WebDavTransport.java rename to k9mail/src/main/java/com/fsck/k9/mail/transport/WebDavTransport.java diff --git a/src/com/fsck/k9/mail/transport/imap/ImapSettings.java b/k9mail/src/main/java/com/fsck/k9/mail/transport/imap/ImapSettings.java similarity index 100% rename from src/com/fsck/k9/mail/transport/imap/ImapSettings.java rename to k9mail/src/main/java/com/fsck/k9/mail/transport/imap/ImapSettings.java diff --git a/src/com/fsck/k9/mailstore/AttachmentMessageBodyUtil.java b/k9mail/src/main/java/com/fsck/k9/mailstore/AttachmentMessageBodyUtil.java similarity index 100% rename from src/com/fsck/k9/mailstore/AttachmentMessageBodyUtil.java rename to k9mail/src/main/java/com/fsck/k9/mailstore/AttachmentMessageBodyUtil.java diff --git a/src/com/fsck/k9/mailstore/BinaryAttachmentBody.java b/k9mail/src/main/java/com/fsck/k9/mailstore/BinaryAttachmentBody.java similarity index 100% rename from src/com/fsck/k9/mailstore/BinaryAttachmentBody.java rename to k9mail/src/main/java/com/fsck/k9/mailstore/BinaryAttachmentBody.java diff --git a/src/com/fsck/k9/mailstore/LocalAttachmentBody.java b/k9mail/src/main/java/com/fsck/k9/mailstore/LocalAttachmentBody.java similarity index 100% rename from src/com/fsck/k9/mailstore/LocalAttachmentBody.java rename to k9mail/src/main/java/com/fsck/k9/mailstore/LocalAttachmentBody.java diff --git a/src/com/fsck/k9/mailstore/LocalAttachmentBodyPart.java b/k9mail/src/main/java/com/fsck/k9/mailstore/LocalAttachmentBodyPart.java similarity index 100% rename from src/com/fsck/k9/mailstore/LocalAttachmentBodyPart.java rename to k9mail/src/main/java/com/fsck/k9/mailstore/LocalAttachmentBodyPart.java diff --git a/src/com/fsck/k9/mailstore/LocalAttachmentMessageBody.java b/k9mail/src/main/java/com/fsck/k9/mailstore/LocalAttachmentMessageBody.java similarity index 100% rename from src/com/fsck/k9/mailstore/LocalAttachmentMessageBody.java rename to k9mail/src/main/java/com/fsck/k9/mailstore/LocalAttachmentMessageBody.java diff --git a/src/com/fsck/k9/mailstore/LocalFolder.java b/k9mail/src/main/java/com/fsck/k9/mailstore/LocalFolder.java similarity index 100% rename from src/com/fsck/k9/mailstore/LocalFolder.java rename to k9mail/src/main/java/com/fsck/k9/mailstore/LocalFolder.java diff --git a/src/com/fsck/k9/mailstore/LocalMessage.java b/k9mail/src/main/java/com/fsck/k9/mailstore/LocalMessage.java similarity index 100% rename from src/com/fsck/k9/mailstore/LocalMessage.java rename to k9mail/src/main/java/com/fsck/k9/mailstore/LocalMessage.java diff --git a/src/com/fsck/k9/mailstore/LocalMessageExtractor.java b/k9mail/src/main/java/com/fsck/k9/mailstore/LocalMessageExtractor.java similarity index 100% rename from src/com/fsck/k9/mailstore/LocalMessageExtractor.java rename to k9mail/src/main/java/com/fsck/k9/mailstore/LocalMessageExtractor.java diff --git a/src/com/fsck/k9/mailstore/LocalStore.java b/k9mail/src/main/java/com/fsck/k9/mailstore/LocalStore.java similarity index 100% rename from src/com/fsck/k9/mailstore/LocalStore.java rename to k9mail/src/main/java/com/fsck/k9/mailstore/LocalStore.java diff --git a/src/com/fsck/k9/mailstore/LocalTextBody.java b/k9mail/src/main/java/com/fsck/k9/mailstore/LocalTextBody.java similarity index 100% rename from src/com/fsck/k9/mailstore/LocalTextBody.java rename to k9mail/src/main/java/com/fsck/k9/mailstore/LocalTextBody.java diff --git a/src/com/fsck/k9/mailstore/LockableDatabase.java b/k9mail/src/main/java/com/fsck/k9/mailstore/LockableDatabase.java similarity index 100% rename from src/com/fsck/k9/mailstore/LockableDatabase.java rename to k9mail/src/main/java/com/fsck/k9/mailstore/LockableDatabase.java diff --git a/src/com/fsck/k9/mailstore/MessageRemovalListener.java b/k9mail/src/main/java/com/fsck/k9/mailstore/MessageRemovalListener.java similarity index 100% rename from src/com/fsck/k9/mailstore/MessageRemovalListener.java rename to k9mail/src/main/java/com/fsck/k9/mailstore/MessageRemovalListener.java diff --git a/src/com/fsck/k9/mailstore/StorageManager.java b/k9mail/src/main/java/com/fsck/k9/mailstore/StorageManager.java similarity index 100% rename from src/com/fsck/k9/mailstore/StorageManager.java rename to k9mail/src/main/java/com/fsck/k9/mailstore/StorageManager.java diff --git a/src/com/fsck/k9/mailstore/StoreSchemaDefinition.java b/k9mail/src/main/java/com/fsck/k9/mailstore/StoreSchemaDefinition.java similarity index 100% rename from src/com/fsck/k9/mailstore/StoreSchemaDefinition.java rename to k9mail/src/main/java/com/fsck/k9/mailstore/StoreSchemaDefinition.java diff --git a/src/com/fsck/k9/mailstore/TempFileBody.java b/k9mail/src/main/java/com/fsck/k9/mailstore/TempFileBody.java similarity index 100% rename from src/com/fsck/k9/mailstore/TempFileBody.java rename to k9mail/src/main/java/com/fsck/k9/mailstore/TempFileBody.java diff --git a/src/com/fsck/k9/mailstore/TempFileMessageBody.java b/k9mail/src/main/java/com/fsck/k9/mailstore/TempFileMessageBody.java similarity index 100% rename from src/com/fsck/k9/mailstore/TempFileMessageBody.java rename to k9mail/src/main/java/com/fsck/k9/mailstore/TempFileMessageBody.java diff --git a/src/com/fsck/k9/mailstore/ThreadInfo.java b/k9mail/src/main/java/com/fsck/k9/mailstore/ThreadInfo.java similarity index 100% rename from src/com/fsck/k9/mailstore/ThreadInfo.java rename to k9mail/src/main/java/com/fsck/k9/mailstore/ThreadInfo.java diff --git a/src/com/fsck/k9/mailstore/UnavailableStorageException.java b/k9mail/src/main/java/com/fsck/k9/mailstore/UnavailableStorageException.java similarity index 100% rename from src/com/fsck/k9/mailstore/UnavailableStorageException.java rename to k9mail/src/main/java/com/fsck/k9/mailstore/UnavailableStorageException.java diff --git a/src/com/fsck/k9/mailstore/ViewableContainer.java b/k9mail/src/main/java/com/fsck/k9/mailstore/ViewableContainer.java similarity index 100% rename from src/com/fsck/k9/mailstore/ViewableContainer.java rename to k9mail/src/main/java/com/fsck/k9/mailstore/ViewableContainer.java diff --git a/src/com/fsck/k9/preferences/AccountSettings.java b/k9mail/src/main/java/com/fsck/k9/preferences/AccountSettings.java similarity index 100% rename from src/com/fsck/k9/preferences/AccountSettings.java rename to k9mail/src/main/java/com/fsck/k9/preferences/AccountSettings.java diff --git a/src/com/fsck/k9/preferences/CheckBoxListPreference.java b/k9mail/src/main/java/com/fsck/k9/preferences/CheckBoxListPreference.java similarity index 100% rename from src/com/fsck/k9/preferences/CheckBoxListPreference.java rename to k9mail/src/main/java/com/fsck/k9/preferences/CheckBoxListPreference.java diff --git a/src/com/fsck/k9/preferences/Editor.java b/k9mail/src/main/java/com/fsck/k9/preferences/Editor.java similarity index 100% rename from src/com/fsck/k9/preferences/Editor.java rename to k9mail/src/main/java/com/fsck/k9/preferences/Editor.java diff --git a/src/com/fsck/k9/preferences/FolderSettings.java b/k9mail/src/main/java/com/fsck/k9/preferences/FolderSettings.java similarity index 100% rename from src/com/fsck/k9/preferences/FolderSettings.java rename to k9mail/src/main/java/com/fsck/k9/preferences/FolderSettings.java diff --git a/src/com/fsck/k9/preferences/GlobalSettings.java b/k9mail/src/main/java/com/fsck/k9/preferences/GlobalSettings.java similarity index 100% rename from src/com/fsck/k9/preferences/GlobalSettings.java rename to k9mail/src/main/java/com/fsck/k9/preferences/GlobalSettings.java diff --git a/src/com/fsck/k9/preferences/IdentitySettings.java b/k9mail/src/main/java/com/fsck/k9/preferences/IdentitySettings.java similarity index 100% rename from src/com/fsck/k9/preferences/IdentitySettings.java rename to k9mail/src/main/java/com/fsck/k9/preferences/IdentitySettings.java diff --git a/src/com/fsck/k9/preferences/Settings.java b/k9mail/src/main/java/com/fsck/k9/preferences/Settings.java similarity index 100% rename from src/com/fsck/k9/preferences/Settings.java rename to k9mail/src/main/java/com/fsck/k9/preferences/Settings.java diff --git a/src/com/fsck/k9/preferences/SettingsExporter.java b/k9mail/src/main/java/com/fsck/k9/preferences/SettingsExporter.java similarity index 100% rename from src/com/fsck/k9/preferences/SettingsExporter.java rename to k9mail/src/main/java/com/fsck/k9/preferences/SettingsExporter.java diff --git a/src/com/fsck/k9/preferences/SettingsImportExportException.java b/k9mail/src/main/java/com/fsck/k9/preferences/SettingsImportExportException.java similarity index 100% rename from src/com/fsck/k9/preferences/SettingsImportExportException.java rename to k9mail/src/main/java/com/fsck/k9/preferences/SettingsImportExportException.java diff --git a/src/com/fsck/k9/preferences/SettingsImporter.java b/k9mail/src/main/java/com/fsck/k9/preferences/SettingsImporter.java similarity index 100% rename from src/com/fsck/k9/preferences/SettingsImporter.java rename to k9mail/src/main/java/com/fsck/k9/preferences/SettingsImporter.java diff --git a/src/com/fsck/k9/preferences/Storage.java b/k9mail/src/main/java/com/fsck/k9/preferences/Storage.java similarity index 100% rename from src/com/fsck/k9/preferences/Storage.java rename to k9mail/src/main/java/com/fsck/k9/preferences/Storage.java diff --git a/src/com/fsck/k9/preferences/TimePickerPreference.java b/k9mail/src/main/java/com/fsck/k9/preferences/TimePickerPreference.java similarity index 100% rename from src/com/fsck/k9/preferences/TimePickerPreference.java rename to k9mail/src/main/java/com/fsck/k9/preferences/TimePickerPreference.java diff --git a/src/com/fsck/k9/provider/AttachmentProvider.java b/k9mail/src/main/java/com/fsck/k9/provider/AttachmentProvider.java similarity index 100% rename from src/com/fsck/k9/provider/AttachmentProvider.java rename to k9mail/src/main/java/com/fsck/k9/provider/AttachmentProvider.java diff --git a/src/com/fsck/k9/provider/EmailProvider.java b/k9mail/src/main/java/com/fsck/k9/provider/EmailProvider.java similarity index 100% rename from src/com/fsck/k9/provider/EmailProvider.java rename to k9mail/src/main/java/com/fsck/k9/provider/EmailProvider.java diff --git a/src/com/fsck/k9/provider/MessageProvider.java b/k9mail/src/main/java/com/fsck/k9/provider/MessageProvider.java similarity index 100% rename from src/com/fsck/k9/provider/MessageProvider.java rename to k9mail/src/main/java/com/fsck/k9/provider/MessageProvider.java diff --git a/src/com/fsck/k9/provider/UnreadWidgetProvider.java b/k9mail/src/main/java/com/fsck/k9/provider/UnreadWidgetProvider.java similarity index 100% rename from src/com/fsck/k9/provider/UnreadWidgetProvider.java rename to k9mail/src/main/java/com/fsck/k9/provider/UnreadWidgetProvider.java diff --git a/src/com/fsck/k9/remotecontrol/AccountReceiver.java b/k9mail/src/main/java/com/fsck/k9/remotecontrol/AccountReceiver.java similarity index 100% rename from src/com/fsck/k9/remotecontrol/AccountReceiver.java rename to k9mail/src/main/java/com/fsck/k9/remotecontrol/AccountReceiver.java diff --git a/src/com/fsck/k9/remotecontrol/K9AccountReceptor.java b/k9mail/src/main/java/com/fsck/k9/remotecontrol/K9AccountReceptor.java similarity index 100% rename from src/com/fsck/k9/remotecontrol/K9AccountReceptor.java rename to k9mail/src/main/java/com/fsck/k9/remotecontrol/K9AccountReceptor.java diff --git a/src/com/fsck/k9/remotecontrol/K9RemoteControl.java b/k9mail/src/main/java/com/fsck/k9/remotecontrol/K9RemoteControl.java similarity index 100% rename from src/com/fsck/k9/remotecontrol/K9RemoteControl.java rename to k9mail/src/main/java/com/fsck/k9/remotecontrol/K9RemoteControl.java diff --git a/src/com/fsck/k9/search/ConditionsTreeNode.java b/k9mail/src/main/java/com/fsck/k9/search/ConditionsTreeNode.java similarity index 100% rename from src/com/fsck/k9/search/ConditionsTreeNode.java rename to k9mail/src/main/java/com/fsck/k9/search/ConditionsTreeNode.java diff --git a/src/com/fsck/k9/search/LocalSearch.java b/k9mail/src/main/java/com/fsck/k9/search/LocalSearch.java similarity index 100% rename from src/com/fsck/k9/search/LocalSearch.java rename to k9mail/src/main/java/com/fsck/k9/search/LocalSearch.java diff --git a/src/com/fsck/k9/search/SearchAccount.java b/k9mail/src/main/java/com/fsck/k9/search/SearchAccount.java similarity index 100% rename from src/com/fsck/k9/search/SearchAccount.java rename to k9mail/src/main/java/com/fsck/k9/search/SearchAccount.java diff --git a/src/com/fsck/k9/search/SearchSpecification.java b/k9mail/src/main/java/com/fsck/k9/search/SearchSpecification.java similarity index 100% rename from src/com/fsck/k9/search/SearchSpecification.java rename to k9mail/src/main/java/com/fsck/k9/search/SearchSpecification.java diff --git a/src/com/fsck/k9/search/SqlQueryBuilder.java b/k9mail/src/main/java/com/fsck/k9/search/SqlQueryBuilder.java similarity index 100% rename from src/com/fsck/k9/search/SqlQueryBuilder.java rename to k9mail/src/main/java/com/fsck/k9/search/SqlQueryBuilder.java diff --git a/src/com/fsck/k9/service/BootReceiver.java b/k9mail/src/main/java/com/fsck/k9/service/BootReceiver.java similarity index 100% rename from src/com/fsck/k9/service/BootReceiver.java rename to k9mail/src/main/java/com/fsck/k9/service/BootReceiver.java diff --git a/src/com/fsck/k9/service/CoreReceiver.java b/k9mail/src/main/java/com/fsck/k9/service/CoreReceiver.java similarity index 100% rename from src/com/fsck/k9/service/CoreReceiver.java rename to k9mail/src/main/java/com/fsck/k9/service/CoreReceiver.java diff --git a/src/com/fsck/k9/service/CoreService.java b/k9mail/src/main/java/com/fsck/k9/service/CoreService.java similarity index 100% rename from src/com/fsck/k9/service/CoreService.java rename to k9mail/src/main/java/com/fsck/k9/service/CoreService.java diff --git a/src/com/fsck/k9/service/DatabaseUpgradeService.java b/k9mail/src/main/java/com/fsck/k9/service/DatabaseUpgradeService.java similarity index 100% rename from src/com/fsck/k9/service/DatabaseUpgradeService.java rename to k9mail/src/main/java/com/fsck/k9/service/DatabaseUpgradeService.java diff --git a/src/com/fsck/k9/service/MailService.java b/k9mail/src/main/java/com/fsck/k9/service/MailService.java similarity index 100% rename from src/com/fsck/k9/service/MailService.java rename to k9mail/src/main/java/com/fsck/k9/service/MailService.java diff --git a/src/com/fsck/k9/service/NotificationActionService.java b/k9mail/src/main/java/com/fsck/k9/service/NotificationActionService.java similarity index 100% rename from src/com/fsck/k9/service/NotificationActionService.java rename to k9mail/src/main/java/com/fsck/k9/service/NotificationActionService.java diff --git a/src/com/fsck/k9/service/PollService.java b/k9mail/src/main/java/com/fsck/k9/service/PollService.java similarity index 100% rename from src/com/fsck/k9/service/PollService.java rename to k9mail/src/main/java/com/fsck/k9/service/PollService.java diff --git a/src/com/fsck/k9/service/PushService.java b/k9mail/src/main/java/com/fsck/k9/service/PushService.java similarity index 100% rename from src/com/fsck/k9/service/PushService.java rename to k9mail/src/main/java/com/fsck/k9/service/PushService.java diff --git a/src/com/fsck/k9/service/RemoteControlReceiver.java b/k9mail/src/main/java/com/fsck/k9/service/RemoteControlReceiver.java similarity index 100% rename from src/com/fsck/k9/service/RemoteControlReceiver.java rename to k9mail/src/main/java/com/fsck/k9/service/RemoteControlReceiver.java diff --git a/src/com/fsck/k9/service/RemoteControlService.java b/k9mail/src/main/java/com/fsck/k9/service/RemoteControlService.java similarity index 100% rename from src/com/fsck/k9/service/RemoteControlService.java rename to k9mail/src/main/java/com/fsck/k9/service/RemoteControlService.java diff --git a/src/com/fsck/k9/service/ShutdownReceiver.java b/k9mail/src/main/java/com/fsck/k9/service/ShutdownReceiver.java similarity index 100% rename from src/com/fsck/k9/service/ShutdownReceiver.java rename to k9mail/src/main/java/com/fsck/k9/service/ShutdownReceiver.java diff --git a/src/com/fsck/k9/service/SleepService.java b/k9mail/src/main/java/com/fsck/k9/service/SleepService.java similarity index 100% rename from src/com/fsck/k9/service/SleepService.java rename to k9mail/src/main/java/com/fsck/k9/service/SleepService.java diff --git a/src/com/fsck/k9/service/StorageGoneReceiver.java b/k9mail/src/main/java/com/fsck/k9/service/StorageGoneReceiver.java similarity index 100% rename from src/com/fsck/k9/service/StorageGoneReceiver.java rename to k9mail/src/main/java/com/fsck/k9/service/StorageGoneReceiver.java diff --git a/src/com/fsck/k9/service/StorageReceiver.java b/k9mail/src/main/java/com/fsck/k9/service/StorageReceiver.java similarity index 100% rename from src/com/fsck/k9/service/StorageReceiver.java rename to k9mail/src/main/java/com/fsck/k9/service/StorageReceiver.java diff --git a/src/com/fsck/k9/view/AttachmentView.java b/k9mail/src/main/java/com/fsck/k9/view/AttachmentView.java similarity index 100% rename from src/com/fsck/k9/view/AttachmentView.java rename to k9mail/src/main/java/com/fsck/k9/view/AttachmentView.java diff --git a/src/com/fsck/k9/view/ClientCertificateSpinner.java b/k9mail/src/main/java/com/fsck/k9/view/ClientCertificateSpinner.java similarity index 100% rename from src/com/fsck/k9/view/ClientCertificateSpinner.java rename to k9mail/src/main/java/com/fsck/k9/view/ClientCertificateSpinner.java diff --git a/src/com/fsck/k9/view/ColorChip.java b/k9mail/src/main/java/com/fsck/k9/view/ColorChip.java similarity index 100% rename from src/com/fsck/k9/view/ColorChip.java rename to k9mail/src/main/java/com/fsck/k9/view/ColorChip.java diff --git a/src/com/fsck/k9/view/FoldableLinearLayout.java b/k9mail/src/main/java/com/fsck/k9/view/FoldableLinearLayout.java similarity index 100% rename from src/com/fsck/k9/view/FoldableLinearLayout.java rename to k9mail/src/main/java/com/fsck/k9/view/FoldableLinearLayout.java diff --git a/src/com/fsck/k9/view/K9PullToRefreshListView.java b/k9mail/src/main/java/com/fsck/k9/view/K9PullToRefreshListView.java similarity index 100% rename from src/com/fsck/k9/view/K9PullToRefreshListView.java rename to k9mail/src/main/java/com/fsck/k9/view/K9PullToRefreshListView.java diff --git a/src/com/fsck/k9/view/MessageHeader.java b/k9mail/src/main/java/com/fsck/k9/view/MessageHeader.java similarity index 100% rename from src/com/fsck/k9/view/MessageHeader.java rename to k9mail/src/main/java/com/fsck/k9/view/MessageHeader.java diff --git a/src/com/fsck/k9/view/MessageOpenPgpView.java b/k9mail/src/main/java/com/fsck/k9/view/MessageOpenPgpView.java similarity index 100% rename from src/com/fsck/k9/view/MessageOpenPgpView.java rename to k9mail/src/main/java/com/fsck/k9/view/MessageOpenPgpView.java diff --git a/src/com/fsck/k9/view/MessageTitleView.java b/k9mail/src/main/java/com/fsck/k9/view/MessageTitleView.java similarity index 100% rename from src/com/fsck/k9/view/MessageTitleView.java rename to k9mail/src/main/java/com/fsck/k9/view/MessageTitleView.java diff --git a/src/com/fsck/k9/view/MessageWebView.java b/k9mail/src/main/java/com/fsck/k9/view/MessageWebView.java similarity index 100% rename from src/com/fsck/k9/view/MessageWebView.java rename to k9mail/src/main/java/com/fsck/k9/view/MessageWebView.java diff --git a/src/com/fsck/k9/view/NonLockingScrollView.java b/k9mail/src/main/java/com/fsck/k9/view/NonLockingScrollView.java similarity index 100% rename from src/com/fsck/k9/view/NonLockingScrollView.java rename to k9mail/src/main/java/com/fsck/k9/view/NonLockingScrollView.java diff --git a/src/com/fsck/k9/view/RigidWebView.java b/k9mail/src/main/java/com/fsck/k9/view/RigidWebView.java similarity index 100% rename from src/com/fsck/k9/view/RigidWebView.java rename to k9mail/src/main/java/com/fsck/k9/view/RigidWebView.java diff --git a/src/com/fsck/k9/view/SingleMessageView.java b/k9mail/src/main/java/com/fsck/k9/view/SingleMessageView.java similarity index 100% rename from src/com/fsck/k9/view/SingleMessageView.java rename to k9mail/src/main/java/com/fsck/k9/view/SingleMessageView.java diff --git a/src/com/fsck/k9/view/ViewSwitcher.java b/k9mail/src/main/java/com/fsck/k9/view/ViewSwitcher.java similarity index 100% rename from src/com/fsck/k9/view/ViewSwitcher.java rename to k9mail/src/main/java/com/fsck/k9/view/ViewSwitcher.java diff --git a/res/anim/slide_in_left.xml b/k9mail/src/main/res/anim/slide_in_left.xml similarity index 100% rename from res/anim/slide_in_left.xml rename to k9mail/src/main/res/anim/slide_in_left.xml diff --git a/res/anim/slide_in_right.xml b/k9mail/src/main/res/anim/slide_in_right.xml similarity index 100% rename from res/anim/slide_in_right.xml rename to k9mail/src/main/res/anim/slide_in_right.xml diff --git a/res/anim/slide_out_left.xml b/k9mail/src/main/res/anim/slide_out_left.xml similarity index 100% rename from res/anim/slide_out_left.xml rename to k9mail/src/main/res/anim/slide_out_left.xml diff --git a/res/anim/slide_out_right.xml b/k9mail/src/main/res/anim/slide_out_right.xml similarity index 100% rename from res/anim/slide_out_right.xml rename to k9mail/src/main/res/anim/slide_out_right.xml diff --git a/res/drawable-hdpi/action_search_folder_dark.png b/k9mail/src/main/res/drawable-hdpi/action_search_folder_dark.png similarity index 100% rename from res/drawable-hdpi/action_search_folder_dark.png rename to k9mail/src/main/res/drawable-hdpi/action_search_folder_dark.png diff --git a/res/drawable-hdpi/action_search_folder_light.png b/k9mail/src/main/res/drawable-hdpi/action_search_folder_light.png similarity index 100% rename from res/drawable-hdpi/action_search_folder_light.png rename to k9mail/src/main/res/drawable-hdpi/action_search_folder_light.png diff --git a/res/drawable-hdpi/attached_image_placeholder.png b/k9mail/src/main/res/drawable-hdpi/attached_image_placeholder.png similarity index 100% rename from res/drawable-hdpi/attached_image_placeholder.png rename to k9mail/src/main/res/drawable-hdpi/attached_image_placeholder.png diff --git a/res/drawable-hdpi/attachment_text_box_dark.9.png b/k9mail/src/main/res/drawable-hdpi/attachment_text_box_dark.9.png similarity index 100% rename from res/drawable-hdpi/attachment_text_box_dark.9.png rename to k9mail/src/main/res/drawable-hdpi/attachment_text_box_dark.9.png diff --git a/res/drawable-hdpi/attachment_text_box_light.9.png b/k9mail/src/main/res/drawable-hdpi/attachment_text_box_light.9.png similarity index 100% rename from res/drawable-hdpi/attachment_text_box_light.9.png rename to k9mail/src/main/res/drawable-hdpi/attachment_text_box_light.9.png diff --git a/res/drawable-hdpi/btn_check_off_normal_holo_dark.png b/k9mail/src/main/res/drawable-hdpi/btn_check_off_normal_holo_dark.png similarity index 100% rename from res/drawable-hdpi/btn_check_off_normal_holo_dark.png rename to k9mail/src/main/res/drawable-hdpi/btn_check_off_normal_holo_dark.png diff --git a/res/drawable-hdpi/btn_check_off_normal_holo_light.png b/k9mail/src/main/res/drawable-hdpi/btn_check_off_normal_holo_light.png similarity index 100% rename from res/drawable-hdpi/btn_check_off_normal_holo_light.png rename to k9mail/src/main/res/drawable-hdpi/btn_check_off_normal_holo_light.png diff --git a/res/drawable-hdpi/btn_check_on_normal_holo_dark.png b/k9mail/src/main/res/drawable-hdpi/btn_check_on_normal_holo_dark.png similarity index 100% rename from res/drawable-hdpi/btn_check_on_normal_holo_dark.png rename to k9mail/src/main/res/drawable-hdpi/btn_check_on_normal_holo_dark.png diff --git a/res/drawable-hdpi/btn_check_on_normal_holo_light.png b/k9mail/src/main/res/drawable-hdpi/btn_check_on_normal_holo_light.png similarity index 100% rename from res/drawable-hdpi/btn_check_on_normal_holo_light.png rename to k9mail/src/main/res/drawable-hdpi/btn_check_on_normal_holo_light.png diff --git a/res/drawable-hdpi/btn_dialog_disable.png b/k9mail/src/main/res/drawable-hdpi/btn_dialog_disable.png similarity index 100% rename from res/drawable-hdpi/btn_dialog_disable.png rename to k9mail/src/main/res/drawable-hdpi/btn_dialog_disable.png diff --git a/res/drawable-hdpi/btn_dialog_normal.png b/k9mail/src/main/res/drawable-hdpi/btn_dialog_normal.png similarity index 100% rename from res/drawable-hdpi/btn_dialog_normal.png rename to k9mail/src/main/res/drawable-hdpi/btn_dialog_normal.png diff --git a/res/drawable-hdpi/btn_dialog_pressed.png b/k9mail/src/main/res/drawable-hdpi/btn_dialog_pressed.png similarity index 100% rename from res/drawable-hdpi/btn_dialog_pressed.png rename to k9mail/src/main/res/drawable-hdpi/btn_dialog_pressed.png diff --git a/res/drawable-hdpi/btn_dialog_selected.png b/k9mail/src/main/res/drawable-hdpi/btn_dialog_selected.png similarity index 100% rename from res/drawable-hdpi/btn_dialog_selected.png rename to k9mail/src/main/res/drawable-hdpi/btn_dialog_selected.png diff --git a/res/drawable-hdpi/btn_edit_disable.png b/k9mail/src/main/res/drawable-hdpi/btn_edit_disable.png similarity index 100% rename from res/drawable-hdpi/btn_edit_disable.png rename to k9mail/src/main/res/drawable-hdpi/btn_edit_disable.png diff --git a/res/drawable-hdpi/btn_edit_normal.png b/k9mail/src/main/res/drawable-hdpi/btn_edit_normal.png similarity index 100% rename from res/drawable-hdpi/btn_edit_normal.png rename to k9mail/src/main/res/drawable-hdpi/btn_edit_normal.png diff --git a/res/drawable-hdpi/btn_edit_pressed.png b/k9mail/src/main/res/drawable-hdpi/btn_edit_pressed.png similarity index 100% rename from res/drawable-hdpi/btn_edit_pressed.png rename to k9mail/src/main/res/drawable-hdpi/btn_edit_pressed.png diff --git a/res/drawable-hdpi/btn_edit_selected.png b/k9mail/src/main/res/drawable-hdpi/btn_edit_selected.png similarity index 100% rename from res/drawable-hdpi/btn_edit_selected.png rename to k9mail/src/main/res/drawable-hdpi/btn_edit_selected.png diff --git a/res/drawable-hdpi/divider_horizontal_email.9.png b/k9mail/src/main/res/drawable-hdpi/divider_horizontal_email.9.png similarity index 100% rename from res/drawable-hdpi/divider_horizontal_email.9.png rename to k9mail/src/main/res/drawable-hdpi/divider_horizontal_email.9.png diff --git a/res/drawable-hdpi/dropdown_ic_arrow_normal_holo_dark.png b/k9mail/src/main/res/drawable-hdpi/dropdown_ic_arrow_normal_holo_dark.png similarity index 100% rename from res/drawable-hdpi/dropdown_ic_arrow_normal_holo_dark.png rename to k9mail/src/main/res/drawable-hdpi/dropdown_ic_arrow_normal_holo_dark.png diff --git a/res/drawable-hdpi/dropdown_ic_arrow_normal_holo_light.png b/k9mail/src/main/res/drawable-hdpi/dropdown_ic_arrow_normal_holo_light.png similarity index 100% rename from res/drawable-hdpi/dropdown_ic_arrow_normal_holo_light.png rename to k9mail/src/main/res/drawable-hdpi/dropdown_ic_arrow_normal_holo_light.png diff --git a/res/drawable-hdpi/folder_dark.png b/k9mail/src/main/res/drawable-hdpi/folder_dark.png similarity index 100% rename from res/drawable-hdpi/folder_dark.png rename to k9mail/src/main/res/drawable-hdpi/folder_dark.png diff --git a/res/drawable-hdpi/folder_light.png b/k9mail/src/main/res/drawable-hdpi/folder_light.png similarity index 100% rename from res/drawable-hdpi/folder_light.png rename to k9mail/src/main/res/drawable-hdpi/folder_light.png diff --git a/res/drawable-hdpi/ic_action_about_dark.png b/k9mail/src/main/res/drawable-hdpi/ic_action_about_dark.png similarity index 100% rename from res/drawable-hdpi/ic_action_about_dark.png rename to k9mail/src/main/res/drawable-hdpi/ic_action_about_dark.png diff --git a/res/drawable-hdpi/ic_action_about_light.png b/k9mail/src/main/res/drawable-hdpi/ic_action_about_light.png similarity index 100% rename from res/drawable-hdpi/ic_action_about_light.png rename to k9mail/src/main/res/drawable-hdpi/ic_action_about_light.png diff --git a/res/drawable-hdpi/ic_action_add_attachment_dark.png b/k9mail/src/main/res/drawable-hdpi/ic_action_add_attachment_dark.png similarity index 100% rename from res/drawable-hdpi/ic_action_add_attachment_dark.png rename to k9mail/src/main/res/drawable-hdpi/ic_action_add_attachment_dark.png diff --git a/res/drawable-hdpi/ic_action_add_attachment_light.png b/k9mail/src/main/res/drawable-hdpi/ic_action_add_attachment_light.png similarity index 100% rename from res/drawable-hdpi/ic_action_add_attachment_light.png rename to k9mail/src/main/res/drawable-hdpi/ic_action_add_attachment_light.png diff --git a/res/drawable-hdpi/ic_action_add_cc_bbc_light.png b/k9mail/src/main/res/drawable-hdpi/ic_action_add_cc_bbc_light.png similarity index 100% rename from res/drawable-hdpi/ic_action_add_cc_bbc_light.png rename to k9mail/src/main/res/drawable-hdpi/ic_action_add_cc_bbc_light.png diff --git a/res/drawable-hdpi/ic_action_add_cc_bcc_dark.png b/k9mail/src/main/res/drawable-hdpi/ic_action_add_cc_bcc_dark.png similarity index 100% rename from res/drawable-hdpi/ic_action_add_cc_bcc_dark.png rename to k9mail/src/main/res/drawable-hdpi/ic_action_add_cc_bcc_dark.png diff --git a/res/drawable-hdpi/ic_action_add_dark.png b/k9mail/src/main/res/drawable-hdpi/ic_action_add_dark.png similarity index 100% rename from res/drawable-hdpi/ic_action_add_dark.png rename to k9mail/src/main/res/drawable-hdpi/ic_action_add_dark.png diff --git a/res/drawable-hdpi/ic_action_add_light.png b/k9mail/src/main/res/drawable-hdpi/ic_action_add_light.png similarity index 100% rename from res/drawable-hdpi/ic_action_add_light.png rename to k9mail/src/main/res/drawable-hdpi/ic_action_add_light.png diff --git a/res/drawable-hdpi/ic_action_archive_dark.png b/k9mail/src/main/res/drawable-hdpi/ic_action_archive_dark.png similarity index 100% rename from res/drawable-hdpi/ic_action_archive_dark.png rename to k9mail/src/main/res/drawable-hdpi/ic_action_archive_dark.png diff --git a/res/drawable-hdpi/ic_action_archive_light.png b/k9mail/src/main/res/drawable-hdpi/ic_action_archive_light.png similarity index 100% rename from res/drawable-hdpi/ic_action_archive_light.png rename to k9mail/src/main/res/drawable-hdpi/ic_action_archive_light.png diff --git a/res/drawable-hdpi/ic_action_cancel_dark.png b/k9mail/src/main/res/drawable-hdpi/ic_action_cancel_dark.png similarity index 100% rename from res/drawable-hdpi/ic_action_cancel_dark.png rename to k9mail/src/main/res/drawable-hdpi/ic_action_cancel_dark.png diff --git a/res/drawable-hdpi/ic_action_cancel_light.png b/k9mail/src/main/res/drawable-hdpi/ic_action_cancel_light.png similarity index 100% rename from res/drawable-hdpi/ic_action_cancel_light.png rename to k9mail/src/main/res/drawable-hdpi/ic_action_cancel_light.png diff --git a/res/drawable-hdpi/ic_action_collapse_dark.png b/k9mail/src/main/res/drawable-hdpi/ic_action_collapse_dark.png similarity index 100% rename from res/drawable-hdpi/ic_action_collapse_dark.png rename to k9mail/src/main/res/drawable-hdpi/ic_action_collapse_dark.png diff --git a/res/drawable-hdpi/ic_action_collapse_light.png b/k9mail/src/main/res/drawable-hdpi/ic_action_collapse_light.png similarity index 100% rename from res/drawable-hdpi/ic_action_collapse_light.png rename to k9mail/src/main/res/drawable-hdpi/ic_action_collapse_light.png diff --git a/res/drawable-hdpi/ic_action_compose_dark.png b/k9mail/src/main/res/drawable-hdpi/ic_action_compose_dark.png similarity index 100% rename from res/drawable-hdpi/ic_action_compose_dark.png rename to k9mail/src/main/res/drawable-hdpi/ic_action_compose_dark.png diff --git a/res/drawable-hdpi/ic_action_compose_light.png b/k9mail/src/main/res/drawable-hdpi/ic_action_compose_light.png similarity index 100% rename from res/drawable-hdpi/ic_action_compose_light.png rename to k9mail/src/main/res/drawable-hdpi/ic_action_compose_light.png diff --git a/res/drawable-hdpi/ic_action_copy_dark.png b/k9mail/src/main/res/drawable-hdpi/ic_action_copy_dark.png similarity index 100% rename from res/drawable-hdpi/ic_action_copy_dark.png rename to k9mail/src/main/res/drawable-hdpi/ic_action_copy_dark.png diff --git a/res/drawable-hdpi/ic_action_copy_light.png b/k9mail/src/main/res/drawable-hdpi/ic_action_copy_light.png similarity index 100% rename from res/drawable-hdpi/ic_action_copy_light.png rename to k9mail/src/main/res/drawable-hdpi/ic_action_copy_light.png diff --git a/res/drawable-hdpi/ic_action_delete_dark.png b/k9mail/src/main/res/drawable-hdpi/ic_action_delete_dark.png similarity index 100% rename from res/drawable-hdpi/ic_action_delete_dark.png rename to k9mail/src/main/res/drawable-hdpi/ic_action_delete_dark.png diff --git a/res/drawable-hdpi/ic_action_delete_light.png b/k9mail/src/main/res/drawable-hdpi/ic_action_delete_light.png similarity index 100% rename from res/drawable-hdpi/ic_action_delete_light.png rename to k9mail/src/main/res/drawable-hdpi/ic_action_delete_light.png diff --git a/res/drawable-hdpi/ic_action_expand_dark.png b/k9mail/src/main/res/drawable-hdpi/ic_action_expand_dark.png similarity index 100% rename from res/drawable-hdpi/ic_action_expand_dark.png rename to k9mail/src/main/res/drawable-hdpi/ic_action_expand_dark.png diff --git a/res/drawable-hdpi/ic_action_expand_light.png b/k9mail/src/main/res/drawable-hdpi/ic_action_expand_light.png similarity index 100% rename from res/drawable-hdpi/ic_action_expand_light.png rename to k9mail/src/main/res/drawable-hdpi/ic_action_expand_light.png diff --git a/res/drawable-hdpi/ic_action_flag_dark.png b/k9mail/src/main/res/drawable-hdpi/ic_action_flag_dark.png similarity index 100% rename from res/drawable-hdpi/ic_action_flag_dark.png rename to k9mail/src/main/res/drawable-hdpi/ic_action_flag_dark.png diff --git a/res/drawable-hdpi/ic_action_flag_light.png b/k9mail/src/main/res/drawable-hdpi/ic_action_flag_light.png similarity index 100% rename from res/drawable-hdpi/ic_action_flag_light.png rename to k9mail/src/main/res/drawable-hdpi/ic_action_flag_light.png diff --git a/res/drawable-hdpi/ic_action_import_export_dark.png b/k9mail/src/main/res/drawable-hdpi/ic_action_import_export_dark.png similarity index 100% rename from res/drawable-hdpi/ic_action_import_export_dark.png rename to k9mail/src/main/res/drawable-hdpi/ic_action_import_export_dark.png diff --git a/res/drawable-hdpi/ic_action_import_export_light.png b/k9mail/src/main/res/drawable-hdpi/ic_action_import_export_light.png similarity index 100% rename from res/drawable-hdpi/ic_action_import_export_light.png rename to k9mail/src/main/res/drawable-hdpi/ic_action_import_export_light.png diff --git a/res/drawable-hdpi/ic_action_mark_as_read_dark.png b/k9mail/src/main/res/drawable-hdpi/ic_action_mark_as_read_dark.png similarity index 100% rename from res/drawable-hdpi/ic_action_mark_as_read_dark.png rename to k9mail/src/main/res/drawable-hdpi/ic_action_mark_as_read_dark.png diff --git a/res/drawable-hdpi/ic_action_mark_as_read_light.png b/k9mail/src/main/res/drawable-hdpi/ic_action_mark_as_read_light.png similarity index 100% rename from res/drawable-hdpi/ic_action_mark_as_read_light.png rename to k9mail/src/main/res/drawable-hdpi/ic_action_mark_as_read_light.png diff --git a/res/drawable-hdpi/ic_action_mark_as_unread_dark.png b/k9mail/src/main/res/drawable-hdpi/ic_action_mark_as_unread_dark.png similarity index 100% rename from res/drawable-hdpi/ic_action_mark_as_unread_dark.png rename to k9mail/src/main/res/drawable-hdpi/ic_action_mark_as_unread_dark.png diff --git a/res/drawable-hdpi/ic_action_mark_as_unread_light.png b/k9mail/src/main/res/drawable-hdpi/ic_action_mark_as_unread_light.png similarity index 100% rename from res/drawable-hdpi/ic_action_mark_as_unread_light.png rename to k9mail/src/main/res/drawable-hdpi/ic_action_mark_as_unread_light.png diff --git a/res/drawable-hdpi/ic_action_move_dark.png b/k9mail/src/main/res/drawable-hdpi/ic_action_move_dark.png similarity index 100% rename from res/drawable-hdpi/ic_action_move_dark.png rename to k9mail/src/main/res/drawable-hdpi/ic_action_move_dark.png diff --git a/res/drawable-hdpi/ic_action_move_light.png b/k9mail/src/main/res/drawable-hdpi/ic_action_move_light.png similarity index 100% rename from res/drawable-hdpi/ic_action_move_light.png rename to k9mail/src/main/res/drawable-hdpi/ic_action_move_light.png diff --git a/res/drawable-hdpi/ic_action_next_message_dark.png b/k9mail/src/main/res/drawable-hdpi/ic_action_next_message_dark.png similarity index 100% rename from res/drawable-hdpi/ic_action_next_message_dark.png rename to k9mail/src/main/res/drawable-hdpi/ic_action_next_message_dark.png diff --git a/res/drawable-hdpi/ic_action_next_message_light.png b/k9mail/src/main/res/drawable-hdpi/ic_action_next_message_light.png similarity index 100% rename from res/drawable-hdpi/ic_action_next_message_light.png rename to k9mail/src/main/res/drawable-hdpi/ic_action_next_message_light.png diff --git a/res/drawable-hdpi/ic_action_previous_message_dark.png b/k9mail/src/main/res/drawable-hdpi/ic_action_previous_message_dark.png similarity index 100% rename from res/drawable-hdpi/ic_action_previous_message_dark.png rename to k9mail/src/main/res/drawable-hdpi/ic_action_previous_message_dark.png diff --git a/res/drawable-hdpi/ic_action_previous_message_light.png b/k9mail/src/main/res/drawable-hdpi/ic_action_previous_message_light.png similarity index 100% rename from res/drawable-hdpi/ic_action_previous_message_light.png rename to k9mail/src/main/res/drawable-hdpi/ic_action_previous_message_light.png diff --git a/res/drawable-hdpi/ic_action_refresh_dark.png b/k9mail/src/main/res/drawable-hdpi/ic_action_refresh_dark.png similarity index 100% rename from res/drawable-hdpi/ic_action_refresh_dark.png rename to k9mail/src/main/res/drawable-hdpi/ic_action_refresh_dark.png diff --git a/res/drawable-hdpi/ic_action_refresh_light.png b/k9mail/src/main/res/drawable-hdpi/ic_action_refresh_light.png similarity index 100% rename from res/drawable-hdpi/ic_action_refresh_light.png rename to k9mail/src/main/res/drawable-hdpi/ic_action_refresh_light.png diff --git a/res/drawable-hdpi/ic_action_remote_search_dark.png b/k9mail/src/main/res/drawable-hdpi/ic_action_remote_search_dark.png similarity index 100% rename from res/drawable-hdpi/ic_action_remote_search_dark.png rename to k9mail/src/main/res/drawable-hdpi/ic_action_remote_search_dark.png diff --git a/res/drawable-hdpi/ic_action_remote_search_light.png b/k9mail/src/main/res/drawable-hdpi/ic_action_remote_search_light.png similarity index 100% rename from res/drawable-hdpi/ic_action_remote_search_light.png rename to k9mail/src/main/res/drawable-hdpi/ic_action_remote_search_light.png diff --git a/res/drawable-hdpi/ic_action_request_read_receipt_dark.png b/k9mail/src/main/res/drawable-hdpi/ic_action_request_read_receipt_dark.png similarity index 100% rename from res/drawable-hdpi/ic_action_request_read_receipt_dark.png rename to k9mail/src/main/res/drawable-hdpi/ic_action_request_read_receipt_dark.png diff --git a/res/drawable-hdpi/ic_action_request_read_receipt_light.png b/k9mail/src/main/res/drawable-hdpi/ic_action_request_read_receipt_light.png similarity index 100% rename from res/drawable-hdpi/ic_action_request_read_receipt_light.png rename to k9mail/src/main/res/drawable-hdpi/ic_action_request_read_receipt_light.png diff --git a/res/drawable-hdpi/ic_action_save_dark.png b/k9mail/src/main/res/drawable-hdpi/ic_action_save_dark.png similarity index 100% rename from res/drawable-hdpi/ic_action_save_dark.png rename to k9mail/src/main/res/drawable-hdpi/ic_action_save_dark.png diff --git a/res/drawable-hdpi/ic_action_save_light.png b/k9mail/src/main/res/drawable-hdpi/ic_action_save_light.png similarity index 100% rename from res/drawable-hdpi/ic_action_save_light.png rename to k9mail/src/main/res/drawable-hdpi/ic_action_save_light.png diff --git a/res/drawable-hdpi/ic_action_search_dark.png b/k9mail/src/main/res/drawable-hdpi/ic_action_search_dark.png similarity index 100% rename from res/drawable-hdpi/ic_action_search_dark.png rename to k9mail/src/main/res/drawable-hdpi/ic_action_search_dark.png diff --git a/res/drawable-hdpi/ic_action_search_light.png b/k9mail/src/main/res/drawable-hdpi/ic_action_search_light.png similarity index 100% rename from res/drawable-hdpi/ic_action_search_light.png rename to k9mail/src/main/res/drawable-hdpi/ic_action_search_light.png diff --git a/res/drawable-hdpi/ic_action_select_all_dark.png b/k9mail/src/main/res/drawable-hdpi/ic_action_select_all_dark.png similarity index 100% rename from res/drawable-hdpi/ic_action_select_all_dark.png rename to k9mail/src/main/res/drawable-hdpi/ic_action_select_all_dark.png diff --git a/res/drawable-hdpi/ic_action_select_all_light.png b/k9mail/src/main/res/drawable-hdpi/ic_action_select_all_light.png similarity index 100% rename from res/drawable-hdpi/ic_action_select_all_light.png rename to k9mail/src/main/res/drawable-hdpi/ic_action_select_all_light.png diff --git a/res/drawable-hdpi/ic_action_send_dark.png b/k9mail/src/main/res/drawable-hdpi/ic_action_send_dark.png similarity index 100% rename from res/drawable-hdpi/ic_action_send_dark.png rename to k9mail/src/main/res/drawable-hdpi/ic_action_send_dark.png diff --git a/res/drawable-hdpi/ic_action_send_light.png b/k9mail/src/main/res/drawable-hdpi/ic_action_send_light.png similarity index 100% rename from res/drawable-hdpi/ic_action_send_light.png rename to k9mail/src/main/res/drawable-hdpi/ic_action_send_light.png diff --git a/res/drawable-hdpi/ic_action_settings_dark.png b/k9mail/src/main/res/drawable-hdpi/ic_action_settings_dark.png similarity index 100% rename from res/drawable-hdpi/ic_action_settings_dark.png rename to k9mail/src/main/res/drawable-hdpi/ic_action_settings_dark.png diff --git a/res/drawable-hdpi/ic_action_settings_light.png b/k9mail/src/main/res/drawable-hdpi/ic_action_settings_light.png similarity index 100% rename from res/drawable-hdpi/ic_action_settings_light.png rename to k9mail/src/main/res/drawable-hdpi/ic_action_settings_light.png diff --git a/res/drawable-hdpi/ic_action_single_message_options_dark.png b/k9mail/src/main/res/drawable-hdpi/ic_action_single_message_options_dark.png similarity index 100% rename from res/drawable-hdpi/ic_action_single_message_options_dark.png rename to k9mail/src/main/res/drawable-hdpi/ic_action_single_message_options_dark.png diff --git a/res/drawable-hdpi/ic_action_single_message_options_light.png b/k9mail/src/main/res/drawable-hdpi/ic_action_single_message_options_light.png similarity index 100% rename from res/drawable-hdpi/ic_action_single_message_options_light.png rename to k9mail/src/main/res/drawable-hdpi/ic_action_single_message_options_light.png diff --git a/res/drawable-hdpi/ic_action_sort_dark.png b/k9mail/src/main/res/drawable-hdpi/ic_action_sort_dark.png similarity index 100% rename from res/drawable-hdpi/ic_action_sort_dark.png rename to k9mail/src/main/res/drawable-hdpi/ic_action_sort_dark.png diff --git a/res/drawable-hdpi/ic_action_sort_light.png b/k9mail/src/main/res/drawable-hdpi/ic_action_sort_light.png similarity index 100% rename from res/drawable-hdpi/ic_action_sort_light.png rename to k9mail/src/main/res/drawable-hdpi/ic_action_sort_light.png diff --git a/res/drawable-hdpi/ic_action_spam_dark.png b/k9mail/src/main/res/drawable-hdpi/ic_action_spam_dark.png similarity index 100% rename from res/drawable-hdpi/ic_action_spam_dark.png rename to k9mail/src/main/res/drawable-hdpi/ic_action_spam_dark.png diff --git a/res/drawable-hdpi/ic_action_spam_light.png b/k9mail/src/main/res/drawable-hdpi/ic_action_spam_light.png similarity index 100% rename from res/drawable-hdpi/ic_action_spam_light.png rename to k9mail/src/main/res/drawable-hdpi/ic_action_spam_light.png diff --git a/res/drawable-hdpi/ic_action_unflag_dark.png b/k9mail/src/main/res/drawable-hdpi/ic_action_unflag_dark.png similarity index 100% rename from res/drawable-hdpi/ic_action_unflag_dark.png rename to k9mail/src/main/res/drawable-hdpi/ic_action_unflag_dark.png diff --git a/res/drawable-hdpi/ic_action_unflag_light.png b/k9mail/src/main/res/drawable-hdpi/ic_action_unflag_light.png similarity index 100% rename from res/drawable-hdpi/ic_action_unflag_light.png rename to k9mail/src/main/res/drawable-hdpi/ic_action_unflag_light.png diff --git a/res/drawable-hdpi/ic_action_upload_dark.png b/k9mail/src/main/res/drawable-hdpi/ic_action_upload_dark.png similarity index 100% rename from res/drawable-hdpi/ic_action_upload_dark.png rename to k9mail/src/main/res/drawable-hdpi/ic_action_upload_dark.png diff --git a/res/drawable-hdpi/ic_action_upload_light.png b/k9mail/src/main/res/drawable-hdpi/ic_action_upload_light.png similarity index 100% rename from res/drawable-hdpi/ic_action_upload_light.png rename to k9mail/src/main/res/drawable-hdpi/ic_action_upload_light.png diff --git a/res/drawable-hdpi/ic_button_add_contact_dark.png b/k9mail/src/main/res/drawable-hdpi/ic_button_add_contact_dark.png similarity index 100% rename from res/drawable-hdpi/ic_button_add_contact_dark.png rename to k9mail/src/main/res/drawable-hdpi/ic_button_add_contact_dark.png diff --git a/res/drawable-hdpi/ic_button_add_contact_light.png b/k9mail/src/main/res/drawable-hdpi/ic_button_add_contact_light.png similarity index 100% rename from res/drawable-hdpi/ic_button_add_contact_light.png rename to k9mail/src/main/res/drawable-hdpi/ic_button_add_contact_light.png diff --git a/res/drawable-hdpi/ic_contact_picture.png b/k9mail/src/main/res/drawable-hdpi/ic_contact_picture.png similarity index 100% rename from res/drawable-hdpi/ic_contact_picture.png rename to k9mail/src/main/res/drawable-hdpi/ic_contact_picture.png diff --git a/res/drawable-hdpi/ic_delete.png b/k9mail/src/main/res/drawable-hdpi/ic_delete.png similarity index 100% rename from res/drawable-hdpi/ic_delete.png rename to k9mail/src/main/res/drawable-hdpi/ic_delete.png diff --git a/res/drawable-hdpi/ic_email_answered_small.png b/k9mail/src/main/res/drawable-hdpi/ic_email_answered_small.png similarity index 100% rename from res/drawable-hdpi/ic_email_answered_small.png rename to k9mail/src/main/res/drawable-hdpi/ic_email_answered_small.png diff --git a/res/drawable-hdpi/ic_email_attachment.png b/k9mail/src/main/res/drawable-hdpi/ic_email_attachment.png similarity index 100% rename from res/drawable-hdpi/ic_email_attachment.png rename to k9mail/src/main/res/drawable-hdpi/ic_email_attachment.png diff --git a/res/drawable-hdpi/ic_email_attachment_small.png b/k9mail/src/main/res/drawable-hdpi/ic_email_attachment_small.png similarity index 100% rename from res/drawable-hdpi/ic_email_attachment_small.png rename to k9mail/src/main/res/drawable-hdpi/ic_email_attachment_small.png diff --git a/res/drawable-hdpi/ic_email_forwarded_small.png b/k9mail/src/main/res/drawable-hdpi/ic_email_forwarded_small.png similarity index 100% rename from res/drawable-hdpi/ic_email_forwarded_small.png rename to k9mail/src/main/res/drawable-hdpi/ic_email_forwarded_small.png diff --git a/res/drawable-hdpi/ic_notify_check_mail_anim_0.png b/k9mail/src/main/res/drawable-hdpi/ic_notify_check_mail_anim_0.png similarity index 100% rename from res/drawable-hdpi/ic_notify_check_mail_anim_0.png rename to k9mail/src/main/res/drawable-hdpi/ic_notify_check_mail_anim_0.png diff --git a/res/drawable-hdpi/ic_notify_check_mail_anim_1.png b/k9mail/src/main/res/drawable-hdpi/ic_notify_check_mail_anim_1.png similarity index 100% rename from res/drawable-hdpi/ic_notify_check_mail_anim_1.png rename to k9mail/src/main/res/drawable-hdpi/ic_notify_check_mail_anim_1.png diff --git a/res/drawable-hdpi/ic_notify_check_mail_anim_2.png b/k9mail/src/main/res/drawable-hdpi/ic_notify_check_mail_anim_2.png similarity index 100% rename from res/drawable-hdpi/ic_notify_check_mail_anim_2.png rename to k9mail/src/main/res/drawable-hdpi/ic_notify_check_mail_anim_2.png diff --git a/res/drawable-hdpi/ic_notify_check_mail_anim_3.png b/k9mail/src/main/res/drawable-hdpi/ic_notify_check_mail_anim_3.png similarity index 100% rename from res/drawable-hdpi/ic_notify_check_mail_anim_3.png rename to k9mail/src/main/res/drawable-hdpi/ic_notify_check_mail_anim_3.png diff --git a/res/drawable-hdpi/ic_notify_check_mail_anim_4.png b/k9mail/src/main/res/drawable-hdpi/ic_notify_check_mail_anim_4.png similarity index 100% rename from res/drawable-hdpi/ic_notify_check_mail_anim_4.png rename to k9mail/src/main/res/drawable-hdpi/ic_notify_check_mail_anim_4.png diff --git a/res/drawable-hdpi/ic_notify_check_mail_anim_5.png b/k9mail/src/main/res/drawable-hdpi/ic_notify_check_mail_anim_5.png similarity index 100% rename from res/drawable-hdpi/ic_notify_check_mail_anim_5.png rename to k9mail/src/main/res/drawable-hdpi/ic_notify_check_mail_anim_5.png diff --git a/res/drawable-hdpi/ic_notify_new_mail.png b/k9mail/src/main/res/drawable-hdpi/ic_notify_new_mail.png similarity index 100% rename from res/drawable-hdpi/ic_notify_new_mail.png rename to k9mail/src/main/res/drawable-hdpi/ic_notify_new_mail.png diff --git a/res/drawable-hdpi/ic_unread_widget.png b/k9mail/src/main/res/drawable-hdpi/ic_unread_widget.png similarity index 100% rename from res/drawable-hdpi/ic_unread_widget.png rename to k9mail/src/main/res/drawable-hdpi/ic_unread_widget.png diff --git a/res/drawable-hdpi/ic_unread_widget_selected.png b/k9mail/src/main/res/drawable-hdpi/ic_unread_widget_selected.png similarity index 100% rename from res/drawable-hdpi/ic_unread_widget_selected.png rename to k9mail/src/main/res/drawable-hdpi/ic_unread_widget_selected.png diff --git a/res/drawable-hdpi/icon.png b/k9mail/src/main/res/drawable-hdpi/icon.png similarity index 100% rename from res/drawable-hdpi/icon.png rename to k9mail/src/main/res/drawable-hdpi/icon.png diff --git a/res/drawable-hdpi/overlay_error.png b/k9mail/src/main/res/drawable-hdpi/overlay_error.png similarity index 100% rename from res/drawable-hdpi/overlay_error.png rename to k9mail/src/main/res/drawable-hdpi/overlay_error.png diff --git a/res/drawable-hdpi/overlay_ok.png b/k9mail/src/main/res/drawable-hdpi/overlay_ok.png similarity index 100% rename from res/drawable-hdpi/overlay_ok.png rename to k9mail/src/main/res/drawable-hdpi/overlay_ok.png diff --git a/res/drawable-hdpi/preview_unread_widget.png b/k9mail/src/main/res/drawable-hdpi/preview_unread_widget.png similarity index 100% rename from res/drawable-hdpi/preview_unread_widget.png rename to k9mail/src/main/res/drawable-hdpi/preview_unread_widget.png diff --git a/res/drawable-mdpi/action_search_folder_dark.png b/k9mail/src/main/res/drawable-mdpi/action_search_folder_dark.png similarity index 100% rename from res/drawable-mdpi/action_search_folder_dark.png rename to k9mail/src/main/res/drawable-mdpi/action_search_folder_dark.png diff --git a/res/drawable-mdpi/action_search_folder_light.png b/k9mail/src/main/res/drawable-mdpi/action_search_folder_light.png similarity index 100% rename from res/drawable-mdpi/action_search_folder_light.png rename to k9mail/src/main/res/drawable-mdpi/action_search_folder_light.png diff --git a/res/drawable-mdpi/attached_image_placeholder.png b/k9mail/src/main/res/drawable-mdpi/attached_image_placeholder.png similarity index 100% rename from res/drawable-mdpi/attached_image_placeholder.png rename to k9mail/src/main/res/drawable-mdpi/attached_image_placeholder.png diff --git a/res/drawable-mdpi/attachment_text_box_dark.9.png b/k9mail/src/main/res/drawable-mdpi/attachment_text_box_dark.9.png similarity index 100% rename from res/drawable-mdpi/attachment_text_box_dark.9.png rename to k9mail/src/main/res/drawable-mdpi/attachment_text_box_dark.9.png diff --git a/res/drawable-mdpi/attachment_text_box_light.9.png b/k9mail/src/main/res/drawable-mdpi/attachment_text_box_light.9.png similarity index 100% rename from res/drawable-mdpi/attachment_text_box_light.9.png rename to k9mail/src/main/res/drawable-mdpi/attachment_text_box_light.9.png diff --git a/res/drawable-mdpi/btn_check_off_normal_holo_dark.png b/k9mail/src/main/res/drawable-mdpi/btn_check_off_normal_holo_dark.png similarity index 100% rename from res/drawable-mdpi/btn_check_off_normal_holo_dark.png rename to k9mail/src/main/res/drawable-mdpi/btn_check_off_normal_holo_dark.png diff --git a/res/drawable-mdpi/btn_check_off_normal_holo_light.png b/k9mail/src/main/res/drawable-mdpi/btn_check_off_normal_holo_light.png similarity index 100% rename from res/drawable-mdpi/btn_check_off_normal_holo_light.png rename to k9mail/src/main/res/drawable-mdpi/btn_check_off_normal_holo_light.png diff --git a/res/drawable-mdpi/btn_check_on_normal_holo_dark.png b/k9mail/src/main/res/drawable-mdpi/btn_check_on_normal_holo_dark.png similarity index 100% rename from res/drawable-mdpi/btn_check_on_normal_holo_dark.png rename to k9mail/src/main/res/drawable-mdpi/btn_check_on_normal_holo_dark.png diff --git a/res/drawable-mdpi/btn_check_on_normal_holo_light.png b/k9mail/src/main/res/drawable-mdpi/btn_check_on_normal_holo_light.png similarity index 100% rename from res/drawable-mdpi/btn_check_on_normal_holo_light.png rename to k9mail/src/main/res/drawable-mdpi/btn_check_on_normal_holo_light.png diff --git a/res/drawable-mdpi/btn_dialog_disable.png b/k9mail/src/main/res/drawable-mdpi/btn_dialog_disable.png similarity index 100% rename from res/drawable-mdpi/btn_dialog_disable.png rename to k9mail/src/main/res/drawable-mdpi/btn_dialog_disable.png diff --git a/res/drawable-mdpi/btn_dialog_normal.png b/k9mail/src/main/res/drawable-mdpi/btn_dialog_normal.png similarity index 100% rename from res/drawable-mdpi/btn_dialog_normal.png rename to k9mail/src/main/res/drawable-mdpi/btn_dialog_normal.png diff --git a/res/drawable-mdpi/btn_dialog_pressed.png b/k9mail/src/main/res/drawable-mdpi/btn_dialog_pressed.png similarity index 100% rename from res/drawable-mdpi/btn_dialog_pressed.png rename to k9mail/src/main/res/drawable-mdpi/btn_dialog_pressed.png diff --git a/res/drawable-mdpi/btn_dialog_selected.png b/k9mail/src/main/res/drawable-mdpi/btn_dialog_selected.png similarity index 100% rename from res/drawable-mdpi/btn_dialog_selected.png rename to k9mail/src/main/res/drawable-mdpi/btn_dialog_selected.png diff --git a/res/drawable-mdpi/btn_edit_disable.png b/k9mail/src/main/res/drawable-mdpi/btn_edit_disable.png similarity index 100% rename from res/drawable-mdpi/btn_edit_disable.png rename to k9mail/src/main/res/drawable-mdpi/btn_edit_disable.png diff --git a/res/drawable-mdpi/btn_edit_normal.png b/k9mail/src/main/res/drawable-mdpi/btn_edit_normal.png similarity index 100% rename from res/drawable-mdpi/btn_edit_normal.png rename to k9mail/src/main/res/drawable-mdpi/btn_edit_normal.png diff --git a/res/drawable-mdpi/btn_edit_pressed.png b/k9mail/src/main/res/drawable-mdpi/btn_edit_pressed.png similarity index 100% rename from res/drawable-mdpi/btn_edit_pressed.png rename to k9mail/src/main/res/drawable-mdpi/btn_edit_pressed.png diff --git a/res/drawable-mdpi/btn_edit_selected.png b/k9mail/src/main/res/drawable-mdpi/btn_edit_selected.png similarity index 100% rename from res/drawable-mdpi/btn_edit_selected.png rename to k9mail/src/main/res/drawable-mdpi/btn_edit_selected.png diff --git a/res/drawable-mdpi/divider_horizontal_email.9.png b/k9mail/src/main/res/drawable-mdpi/divider_horizontal_email.9.png similarity index 100% rename from res/drawable-mdpi/divider_horizontal_email.9.png rename to k9mail/src/main/res/drawable-mdpi/divider_horizontal_email.9.png diff --git a/res/drawable-mdpi/dropdown_ic_arrow_normal_holo_dark.png b/k9mail/src/main/res/drawable-mdpi/dropdown_ic_arrow_normal_holo_dark.png similarity index 100% rename from res/drawable-mdpi/dropdown_ic_arrow_normal_holo_dark.png rename to k9mail/src/main/res/drawable-mdpi/dropdown_ic_arrow_normal_holo_dark.png diff --git a/res/drawable-mdpi/dropdown_ic_arrow_normal_holo_light.png b/k9mail/src/main/res/drawable-mdpi/dropdown_ic_arrow_normal_holo_light.png similarity index 100% rename from res/drawable-mdpi/dropdown_ic_arrow_normal_holo_light.png rename to k9mail/src/main/res/drawable-mdpi/dropdown_ic_arrow_normal_holo_light.png diff --git a/res/drawable-mdpi/folder_dark.png b/k9mail/src/main/res/drawable-mdpi/folder_dark.png similarity index 100% rename from res/drawable-mdpi/folder_dark.png rename to k9mail/src/main/res/drawable-mdpi/folder_dark.png diff --git a/res/drawable-mdpi/folder_light.png b/k9mail/src/main/res/drawable-mdpi/folder_light.png similarity index 100% rename from res/drawable-mdpi/folder_light.png rename to k9mail/src/main/res/drawable-mdpi/folder_light.png diff --git a/res/drawable-mdpi/ic_action_about_dark.png b/k9mail/src/main/res/drawable-mdpi/ic_action_about_dark.png similarity index 100% rename from res/drawable-mdpi/ic_action_about_dark.png rename to k9mail/src/main/res/drawable-mdpi/ic_action_about_dark.png diff --git a/res/drawable-mdpi/ic_action_about_light.png b/k9mail/src/main/res/drawable-mdpi/ic_action_about_light.png similarity index 100% rename from res/drawable-mdpi/ic_action_about_light.png rename to k9mail/src/main/res/drawable-mdpi/ic_action_about_light.png diff --git a/res/drawable-mdpi/ic_action_add_attachment_dark.png b/k9mail/src/main/res/drawable-mdpi/ic_action_add_attachment_dark.png similarity index 100% rename from res/drawable-mdpi/ic_action_add_attachment_dark.png rename to k9mail/src/main/res/drawable-mdpi/ic_action_add_attachment_dark.png diff --git a/res/drawable-mdpi/ic_action_add_attachment_light.png b/k9mail/src/main/res/drawable-mdpi/ic_action_add_attachment_light.png similarity index 100% rename from res/drawable-mdpi/ic_action_add_attachment_light.png rename to k9mail/src/main/res/drawable-mdpi/ic_action_add_attachment_light.png diff --git a/res/drawable-mdpi/ic_action_add_cc_bbc_light.png b/k9mail/src/main/res/drawable-mdpi/ic_action_add_cc_bbc_light.png similarity index 100% rename from res/drawable-mdpi/ic_action_add_cc_bbc_light.png rename to k9mail/src/main/res/drawable-mdpi/ic_action_add_cc_bbc_light.png diff --git a/res/drawable-mdpi/ic_action_add_cc_bcc_dark.png b/k9mail/src/main/res/drawable-mdpi/ic_action_add_cc_bcc_dark.png similarity index 100% rename from res/drawable-mdpi/ic_action_add_cc_bcc_dark.png rename to k9mail/src/main/res/drawable-mdpi/ic_action_add_cc_bcc_dark.png diff --git a/res/drawable-mdpi/ic_action_add_dark.png b/k9mail/src/main/res/drawable-mdpi/ic_action_add_dark.png similarity index 100% rename from res/drawable-mdpi/ic_action_add_dark.png rename to k9mail/src/main/res/drawable-mdpi/ic_action_add_dark.png diff --git a/res/drawable-mdpi/ic_action_add_light.png b/k9mail/src/main/res/drawable-mdpi/ic_action_add_light.png similarity index 100% rename from res/drawable-mdpi/ic_action_add_light.png rename to k9mail/src/main/res/drawable-mdpi/ic_action_add_light.png diff --git a/res/drawable-mdpi/ic_action_archive_dark.png b/k9mail/src/main/res/drawable-mdpi/ic_action_archive_dark.png similarity index 100% rename from res/drawable-mdpi/ic_action_archive_dark.png rename to k9mail/src/main/res/drawable-mdpi/ic_action_archive_dark.png diff --git a/res/drawable-mdpi/ic_action_archive_light.png b/k9mail/src/main/res/drawable-mdpi/ic_action_archive_light.png similarity index 100% rename from res/drawable-mdpi/ic_action_archive_light.png rename to k9mail/src/main/res/drawable-mdpi/ic_action_archive_light.png diff --git a/res/drawable-mdpi/ic_action_cancel_dark.png b/k9mail/src/main/res/drawable-mdpi/ic_action_cancel_dark.png similarity index 100% rename from res/drawable-mdpi/ic_action_cancel_dark.png rename to k9mail/src/main/res/drawable-mdpi/ic_action_cancel_dark.png diff --git a/res/drawable-mdpi/ic_action_cancel_light.png b/k9mail/src/main/res/drawable-mdpi/ic_action_cancel_light.png similarity index 100% rename from res/drawable-mdpi/ic_action_cancel_light.png rename to k9mail/src/main/res/drawable-mdpi/ic_action_cancel_light.png diff --git a/res/drawable-mdpi/ic_action_collapse_dark.png b/k9mail/src/main/res/drawable-mdpi/ic_action_collapse_dark.png similarity index 100% rename from res/drawable-mdpi/ic_action_collapse_dark.png rename to k9mail/src/main/res/drawable-mdpi/ic_action_collapse_dark.png diff --git a/res/drawable-mdpi/ic_action_collapse_light.png b/k9mail/src/main/res/drawable-mdpi/ic_action_collapse_light.png similarity index 100% rename from res/drawable-mdpi/ic_action_collapse_light.png rename to k9mail/src/main/res/drawable-mdpi/ic_action_collapse_light.png diff --git a/res/drawable-mdpi/ic_action_compose_dark.png b/k9mail/src/main/res/drawable-mdpi/ic_action_compose_dark.png similarity index 100% rename from res/drawable-mdpi/ic_action_compose_dark.png rename to k9mail/src/main/res/drawable-mdpi/ic_action_compose_dark.png diff --git a/res/drawable-mdpi/ic_action_compose_light.png b/k9mail/src/main/res/drawable-mdpi/ic_action_compose_light.png similarity index 100% rename from res/drawable-mdpi/ic_action_compose_light.png rename to k9mail/src/main/res/drawable-mdpi/ic_action_compose_light.png diff --git a/res/drawable-mdpi/ic_action_copy_dark.png b/k9mail/src/main/res/drawable-mdpi/ic_action_copy_dark.png similarity index 100% rename from res/drawable-mdpi/ic_action_copy_dark.png rename to k9mail/src/main/res/drawable-mdpi/ic_action_copy_dark.png diff --git a/res/drawable-mdpi/ic_action_copy_light.png b/k9mail/src/main/res/drawable-mdpi/ic_action_copy_light.png similarity index 100% rename from res/drawable-mdpi/ic_action_copy_light.png rename to k9mail/src/main/res/drawable-mdpi/ic_action_copy_light.png diff --git a/res/drawable-mdpi/ic_action_delete_dark.png b/k9mail/src/main/res/drawable-mdpi/ic_action_delete_dark.png similarity index 100% rename from res/drawable-mdpi/ic_action_delete_dark.png rename to k9mail/src/main/res/drawable-mdpi/ic_action_delete_dark.png diff --git a/res/drawable-mdpi/ic_action_delete_light.png b/k9mail/src/main/res/drawable-mdpi/ic_action_delete_light.png similarity index 100% rename from res/drawable-mdpi/ic_action_delete_light.png rename to k9mail/src/main/res/drawable-mdpi/ic_action_delete_light.png diff --git a/res/drawable-mdpi/ic_action_expand_dark.png b/k9mail/src/main/res/drawable-mdpi/ic_action_expand_dark.png similarity index 100% rename from res/drawable-mdpi/ic_action_expand_dark.png rename to k9mail/src/main/res/drawable-mdpi/ic_action_expand_dark.png diff --git a/res/drawable-mdpi/ic_action_expand_light.png b/k9mail/src/main/res/drawable-mdpi/ic_action_expand_light.png similarity index 100% rename from res/drawable-mdpi/ic_action_expand_light.png rename to k9mail/src/main/res/drawable-mdpi/ic_action_expand_light.png diff --git a/res/drawable-mdpi/ic_action_flag_dark.png b/k9mail/src/main/res/drawable-mdpi/ic_action_flag_dark.png similarity index 100% rename from res/drawable-mdpi/ic_action_flag_dark.png rename to k9mail/src/main/res/drawable-mdpi/ic_action_flag_dark.png diff --git a/res/drawable-mdpi/ic_action_flag_light.png b/k9mail/src/main/res/drawable-mdpi/ic_action_flag_light.png similarity index 100% rename from res/drawable-mdpi/ic_action_flag_light.png rename to k9mail/src/main/res/drawable-mdpi/ic_action_flag_light.png diff --git a/res/drawable-mdpi/ic_action_import_export_dark.png b/k9mail/src/main/res/drawable-mdpi/ic_action_import_export_dark.png similarity index 100% rename from res/drawable-mdpi/ic_action_import_export_dark.png rename to k9mail/src/main/res/drawable-mdpi/ic_action_import_export_dark.png diff --git a/res/drawable-mdpi/ic_action_import_export_light.png b/k9mail/src/main/res/drawable-mdpi/ic_action_import_export_light.png similarity index 100% rename from res/drawable-mdpi/ic_action_import_export_light.png rename to k9mail/src/main/res/drawable-mdpi/ic_action_import_export_light.png diff --git a/res/drawable-mdpi/ic_action_mark_as_read_dark.png b/k9mail/src/main/res/drawable-mdpi/ic_action_mark_as_read_dark.png similarity index 100% rename from res/drawable-mdpi/ic_action_mark_as_read_dark.png rename to k9mail/src/main/res/drawable-mdpi/ic_action_mark_as_read_dark.png diff --git a/res/drawable-mdpi/ic_action_mark_as_read_light.png b/k9mail/src/main/res/drawable-mdpi/ic_action_mark_as_read_light.png similarity index 100% rename from res/drawable-mdpi/ic_action_mark_as_read_light.png rename to k9mail/src/main/res/drawable-mdpi/ic_action_mark_as_read_light.png diff --git a/res/drawable-mdpi/ic_action_mark_as_unread_dark.png b/k9mail/src/main/res/drawable-mdpi/ic_action_mark_as_unread_dark.png similarity index 100% rename from res/drawable-mdpi/ic_action_mark_as_unread_dark.png rename to k9mail/src/main/res/drawable-mdpi/ic_action_mark_as_unread_dark.png diff --git a/res/drawable-mdpi/ic_action_mark_as_unread_light.png b/k9mail/src/main/res/drawable-mdpi/ic_action_mark_as_unread_light.png similarity index 100% rename from res/drawable-mdpi/ic_action_mark_as_unread_light.png rename to k9mail/src/main/res/drawable-mdpi/ic_action_mark_as_unread_light.png diff --git a/res/drawable-mdpi/ic_action_move_dark.png b/k9mail/src/main/res/drawable-mdpi/ic_action_move_dark.png similarity index 100% rename from res/drawable-mdpi/ic_action_move_dark.png rename to k9mail/src/main/res/drawable-mdpi/ic_action_move_dark.png diff --git a/res/drawable-mdpi/ic_action_move_light.png b/k9mail/src/main/res/drawable-mdpi/ic_action_move_light.png similarity index 100% rename from res/drawable-mdpi/ic_action_move_light.png rename to k9mail/src/main/res/drawable-mdpi/ic_action_move_light.png diff --git a/res/drawable-mdpi/ic_action_next_message_dark.png b/k9mail/src/main/res/drawable-mdpi/ic_action_next_message_dark.png similarity index 100% rename from res/drawable-mdpi/ic_action_next_message_dark.png rename to k9mail/src/main/res/drawable-mdpi/ic_action_next_message_dark.png diff --git a/res/drawable-mdpi/ic_action_next_message_light.png b/k9mail/src/main/res/drawable-mdpi/ic_action_next_message_light.png similarity index 100% rename from res/drawable-mdpi/ic_action_next_message_light.png rename to k9mail/src/main/res/drawable-mdpi/ic_action_next_message_light.png diff --git a/res/drawable-mdpi/ic_action_previous_message_dark.png b/k9mail/src/main/res/drawable-mdpi/ic_action_previous_message_dark.png similarity index 100% rename from res/drawable-mdpi/ic_action_previous_message_dark.png rename to k9mail/src/main/res/drawable-mdpi/ic_action_previous_message_dark.png diff --git a/res/drawable-mdpi/ic_action_previous_message_light.png b/k9mail/src/main/res/drawable-mdpi/ic_action_previous_message_light.png similarity index 100% rename from res/drawable-mdpi/ic_action_previous_message_light.png rename to k9mail/src/main/res/drawable-mdpi/ic_action_previous_message_light.png diff --git a/res/drawable-mdpi/ic_action_refresh_dark.png b/k9mail/src/main/res/drawable-mdpi/ic_action_refresh_dark.png similarity index 100% rename from res/drawable-mdpi/ic_action_refresh_dark.png rename to k9mail/src/main/res/drawable-mdpi/ic_action_refresh_dark.png diff --git a/res/drawable-mdpi/ic_action_refresh_light.png b/k9mail/src/main/res/drawable-mdpi/ic_action_refresh_light.png similarity index 100% rename from res/drawable-mdpi/ic_action_refresh_light.png rename to k9mail/src/main/res/drawable-mdpi/ic_action_refresh_light.png diff --git a/res/drawable-mdpi/ic_action_remote_search_dark.png b/k9mail/src/main/res/drawable-mdpi/ic_action_remote_search_dark.png similarity index 100% rename from res/drawable-mdpi/ic_action_remote_search_dark.png rename to k9mail/src/main/res/drawable-mdpi/ic_action_remote_search_dark.png diff --git a/res/drawable-mdpi/ic_action_remote_search_light.png b/k9mail/src/main/res/drawable-mdpi/ic_action_remote_search_light.png similarity index 100% rename from res/drawable-mdpi/ic_action_remote_search_light.png rename to k9mail/src/main/res/drawable-mdpi/ic_action_remote_search_light.png diff --git a/res/drawable-mdpi/ic_action_request_read_receipt_dark.png b/k9mail/src/main/res/drawable-mdpi/ic_action_request_read_receipt_dark.png similarity index 100% rename from res/drawable-mdpi/ic_action_request_read_receipt_dark.png rename to k9mail/src/main/res/drawable-mdpi/ic_action_request_read_receipt_dark.png diff --git a/res/drawable-mdpi/ic_action_request_read_receipt_light.png b/k9mail/src/main/res/drawable-mdpi/ic_action_request_read_receipt_light.png similarity index 100% rename from res/drawable-mdpi/ic_action_request_read_receipt_light.png rename to k9mail/src/main/res/drawable-mdpi/ic_action_request_read_receipt_light.png diff --git a/res/drawable-mdpi/ic_action_save_dark.png b/k9mail/src/main/res/drawable-mdpi/ic_action_save_dark.png similarity index 100% rename from res/drawable-mdpi/ic_action_save_dark.png rename to k9mail/src/main/res/drawable-mdpi/ic_action_save_dark.png diff --git a/res/drawable-mdpi/ic_action_save_light.png b/k9mail/src/main/res/drawable-mdpi/ic_action_save_light.png similarity index 100% rename from res/drawable-mdpi/ic_action_save_light.png rename to k9mail/src/main/res/drawable-mdpi/ic_action_save_light.png diff --git a/res/drawable-mdpi/ic_action_search_dark.png b/k9mail/src/main/res/drawable-mdpi/ic_action_search_dark.png similarity index 100% rename from res/drawable-mdpi/ic_action_search_dark.png rename to k9mail/src/main/res/drawable-mdpi/ic_action_search_dark.png diff --git a/res/drawable-mdpi/ic_action_search_light.png b/k9mail/src/main/res/drawable-mdpi/ic_action_search_light.png similarity index 100% rename from res/drawable-mdpi/ic_action_search_light.png rename to k9mail/src/main/res/drawable-mdpi/ic_action_search_light.png diff --git a/res/drawable-mdpi/ic_action_select_all_dark.png b/k9mail/src/main/res/drawable-mdpi/ic_action_select_all_dark.png similarity index 100% rename from res/drawable-mdpi/ic_action_select_all_dark.png rename to k9mail/src/main/res/drawable-mdpi/ic_action_select_all_dark.png diff --git a/res/drawable-mdpi/ic_action_select_all_light.png b/k9mail/src/main/res/drawable-mdpi/ic_action_select_all_light.png similarity index 100% rename from res/drawable-mdpi/ic_action_select_all_light.png rename to k9mail/src/main/res/drawable-mdpi/ic_action_select_all_light.png diff --git a/res/drawable-mdpi/ic_action_send_dark.png b/k9mail/src/main/res/drawable-mdpi/ic_action_send_dark.png similarity index 100% rename from res/drawable-mdpi/ic_action_send_dark.png rename to k9mail/src/main/res/drawable-mdpi/ic_action_send_dark.png diff --git a/res/drawable-mdpi/ic_action_send_light.png b/k9mail/src/main/res/drawable-mdpi/ic_action_send_light.png similarity index 100% rename from res/drawable-mdpi/ic_action_send_light.png rename to k9mail/src/main/res/drawable-mdpi/ic_action_send_light.png diff --git a/res/drawable-mdpi/ic_action_settings_dark.png b/k9mail/src/main/res/drawable-mdpi/ic_action_settings_dark.png similarity index 100% rename from res/drawable-mdpi/ic_action_settings_dark.png rename to k9mail/src/main/res/drawable-mdpi/ic_action_settings_dark.png diff --git a/res/drawable-mdpi/ic_action_settings_light.png b/k9mail/src/main/res/drawable-mdpi/ic_action_settings_light.png similarity index 100% rename from res/drawable-mdpi/ic_action_settings_light.png rename to k9mail/src/main/res/drawable-mdpi/ic_action_settings_light.png diff --git a/res/drawable-mdpi/ic_action_single_message_options_dark.png b/k9mail/src/main/res/drawable-mdpi/ic_action_single_message_options_dark.png similarity index 100% rename from res/drawable-mdpi/ic_action_single_message_options_dark.png rename to k9mail/src/main/res/drawable-mdpi/ic_action_single_message_options_dark.png diff --git a/res/drawable-mdpi/ic_action_single_message_options_light.png b/k9mail/src/main/res/drawable-mdpi/ic_action_single_message_options_light.png similarity index 100% rename from res/drawable-mdpi/ic_action_single_message_options_light.png rename to k9mail/src/main/res/drawable-mdpi/ic_action_single_message_options_light.png diff --git a/res/drawable-mdpi/ic_action_sort_dark.png b/k9mail/src/main/res/drawable-mdpi/ic_action_sort_dark.png similarity index 100% rename from res/drawable-mdpi/ic_action_sort_dark.png rename to k9mail/src/main/res/drawable-mdpi/ic_action_sort_dark.png diff --git a/res/drawable-mdpi/ic_action_sort_light.png b/k9mail/src/main/res/drawable-mdpi/ic_action_sort_light.png similarity index 100% rename from res/drawable-mdpi/ic_action_sort_light.png rename to k9mail/src/main/res/drawable-mdpi/ic_action_sort_light.png diff --git a/res/drawable-mdpi/ic_action_spam_dark.png b/k9mail/src/main/res/drawable-mdpi/ic_action_spam_dark.png similarity index 100% rename from res/drawable-mdpi/ic_action_spam_dark.png rename to k9mail/src/main/res/drawable-mdpi/ic_action_spam_dark.png diff --git a/res/drawable-mdpi/ic_action_spam_light.png b/k9mail/src/main/res/drawable-mdpi/ic_action_spam_light.png similarity index 100% rename from res/drawable-mdpi/ic_action_spam_light.png rename to k9mail/src/main/res/drawable-mdpi/ic_action_spam_light.png diff --git a/res/drawable-mdpi/ic_action_unflag_dark.png b/k9mail/src/main/res/drawable-mdpi/ic_action_unflag_dark.png similarity index 100% rename from res/drawable-mdpi/ic_action_unflag_dark.png rename to k9mail/src/main/res/drawable-mdpi/ic_action_unflag_dark.png diff --git a/res/drawable-mdpi/ic_action_unflag_light.png b/k9mail/src/main/res/drawable-mdpi/ic_action_unflag_light.png similarity index 100% rename from res/drawable-mdpi/ic_action_unflag_light.png rename to k9mail/src/main/res/drawable-mdpi/ic_action_unflag_light.png diff --git a/res/drawable-mdpi/ic_action_upload_dark.png b/k9mail/src/main/res/drawable-mdpi/ic_action_upload_dark.png similarity index 100% rename from res/drawable-mdpi/ic_action_upload_dark.png rename to k9mail/src/main/res/drawable-mdpi/ic_action_upload_dark.png diff --git a/res/drawable-mdpi/ic_action_upload_light.png b/k9mail/src/main/res/drawable-mdpi/ic_action_upload_light.png similarity index 100% rename from res/drawable-mdpi/ic_action_upload_light.png rename to k9mail/src/main/res/drawable-mdpi/ic_action_upload_light.png diff --git a/res/drawable-mdpi/ic_button_add_contact_dark.png b/k9mail/src/main/res/drawable-mdpi/ic_button_add_contact_dark.png similarity index 100% rename from res/drawable-mdpi/ic_button_add_contact_dark.png rename to k9mail/src/main/res/drawable-mdpi/ic_button_add_contact_dark.png diff --git a/res/drawable-mdpi/ic_button_add_contact_light.png b/k9mail/src/main/res/drawable-mdpi/ic_button_add_contact_light.png similarity index 100% rename from res/drawable-mdpi/ic_button_add_contact_light.png rename to k9mail/src/main/res/drawable-mdpi/ic_button_add_contact_light.png diff --git a/res/drawable-mdpi/ic_contact_picture.png b/k9mail/src/main/res/drawable-mdpi/ic_contact_picture.png similarity index 100% rename from res/drawable-mdpi/ic_contact_picture.png rename to k9mail/src/main/res/drawable-mdpi/ic_contact_picture.png diff --git a/res/drawable-mdpi/ic_delete.png b/k9mail/src/main/res/drawable-mdpi/ic_delete.png similarity index 100% rename from res/drawable-mdpi/ic_delete.png rename to k9mail/src/main/res/drawable-mdpi/ic_delete.png diff --git a/res/drawable-mdpi/ic_email_answered_small.png b/k9mail/src/main/res/drawable-mdpi/ic_email_answered_small.png similarity index 100% rename from res/drawable-mdpi/ic_email_answered_small.png rename to k9mail/src/main/res/drawable-mdpi/ic_email_answered_small.png diff --git a/res/drawable-mdpi/ic_email_attachment.png b/k9mail/src/main/res/drawable-mdpi/ic_email_attachment.png similarity index 100% rename from res/drawable-mdpi/ic_email_attachment.png rename to k9mail/src/main/res/drawable-mdpi/ic_email_attachment.png diff --git a/res/drawable-mdpi/ic_email_attachment_small.png b/k9mail/src/main/res/drawable-mdpi/ic_email_attachment_small.png similarity index 100% rename from res/drawable-mdpi/ic_email_attachment_small.png rename to k9mail/src/main/res/drawable-mdpi/ic_email_attachment_small.png diff --git a/res/drawable-mdpi/ic_email_forwarded_answered_small.png b/k9mail/src/main/res/drawable-mdpi/ic_email_forwarded_answered_small.png similarity index 100% rename from res/drawable-mdpi/ic_email_forwarded_answered_small.png rename to k9mail/src/main/res/drawable-mdpi/ic_email_forwarded_answered_small.png diff --git a/res/drawable-mdpi/ic_email_forwarded_small.png b/k9mail/src/main/res/drawable-mdpi/ic_email_forwarded_small.png similarity index 100% rename from res/drawable-mdpi/ic_email_forwarded_small.png rename to k9mail/src/main/res/drawable-mdpi/ic_email_forwarded_small.png diff --git a/res/drawable-mdpi/ic_notify_check_mail_anim_0.png b/k9mail/src/main/res/drawable-mdpi/ic_notify_check_mail_anim_0.png similarity index 100% rename from res/drawable-mdpi/ic_notify_check_mail_anim_0.png rename to k9mail/src/main/res/drawable-mdpi/ic_notify_check_mail_anim_0.png diff --git a/res/drawable-mdpi/ic_notify_check_mail_anim_1.png b/k9mail/src/main/res/drawable-mdpi/ic_notify_check_mail_anim_1.png similarity index 100% rename from res/drawable-mdpi/ic_notify_check_mail_anim_1.png rename to k9mail/src/main/res/drawable-mdpi/ic_notify_check_mail_anim_1.png diff --git a/res/drawable-mdpi/ic_notify_check_mail_anim_2.png b/k9mail/src/main/res/drawable-mdpi/ic_notify_check_mail_anim_2.png similarity index 100% rename from res/drawable-mdpi/ic_notify_check_mail_anim_2.png rename to k9mail/src/main/res/drawable-mdpi/ic_notify_check_mail_anim_2.png diff --git a/res/drawable-mdpi/ic_notify_check_mail_anim_3.png b/k9mail/src/main/res/drawable-mdpi/ic_notify_check_mail_anim_3.png similarity index 100% rename from res/drawable-mdpi/ic_notify_check_mail_anim_3.png rename to k9mail/src/main/res/drawable-mdpi/ic_notify_check_mail_anim_3.png diff --git a/res/drawable-mdpi/ic_notify_check_mail_anim_4.png b/k9mail/src/main/res/drawable-mdpi/ic_notify_check_mail_anim_4.png similarity index 100% rename from res/drawable-mdpi/ic_notify_check_mail_anim_4.png rename to k9mail/src/main/res/drawable-mdpi/ic_notify_check_mail_anim_4.png diff --git a/res/drawable-mdpi/ic_notify_check_mail_anim_5.png b/k9mail/src/main/res/drawable-mdpi/ic_notify_check_mail_anim_5.png similarity index 100% rename from res/drawable-mdpi/ic_notify_check_mail_anim_5.png rename to k9mail/src/main/res/drawable-mdpi/ic_notify_check_mail_anim_5.png diff --git a/res/drawable-mdpi/ic_notify_new_mail.png b/k9mail/src/main/res/drawable-mdpi/ic_notify_new_mail.png similarity index 100% rename from res/drawable-mdpi/ic_notify_new_mail.png rename to k9mail/src/main/res/drawable-mdpi/ic_notify_new_mail.png diff --git a/res/drawable-mdpi/ic_unread_widget.png b/k9mail/src/main/res/drawable-mdpi/ic_unread_widget.png similarity index 100% rename from res/drawable-mdpi/ic_unread_widget.png rename to k9mail/src/main/res/drawable-mdpi/ic_unread_widget.png diff --git a/res/drawable-mdpi/ic_unread_widget_selected.png b/k9mail/src/main/res/drawable-mdpi/ic_unread_widget_selected.png similarity index 100% rename from res/drawable-mdpi/ic_unread_widget_selected.png rename to k9mail/src/main/res/drawable-mdpi/ic_unread_widget_selected.png diff --git a/res/drawable-mdpi/icon.png b/k9mail/src/main/res/drawable-mdpi/icon.png similarity index 100% rename from res/drawable-mdpi/icon.png rename to k9mail/src/main/res/drawable-mdpi/icon.png diff --git a/res/drawable-mdpi/overlay_error.png b/k9mail/src/main/res/drawable-mdpi/overlay_error.png similarity index 100% rename from res/drawable-mdpi/overlay_error.png rename to k9mail/src/main/res/drawable-mdpi/overlay_error.png diff --git a/res/drawable-mdpi/overlay_ok.png b/k9mail/src/main/res/drawable-mdpi/overlay_ok.png similarity index 100% rename from res/drawable-mdpi/overlay_ok.png rename to k9mail/src/main/res/drawable-mdpi/overlay_ok.png diff --git a/res/drawable-mdpi/panel_separator.9.png b/k9mail/src/main/res/drawable-mdpi/panel_separator.9.png similarity index 100% rename from res/drawable-mdpi/panel_separator.9.png rename to k9mail/src/main/res/drawable-mdpi/panel_separator.9.png diff --git a/res/drawable-mdpi/popup_background.9.png b/k9mail/src/main/res/drawable-mdpi/popup_background.9.png similarity index 100% rename from res/drawable-mdpi/popup_background.9.png rename to k9mail/src/main/res/drawable-mdpi/popup_background.9.png diff --git a/res/drawable-mdpi/signed_large.png b/k9mail/src/main/res/drawable-mdpi/signed_large.png similarity index 100% rename from res/drawable-mdpi/signed_large.png rename to k9mail/src/main/res/drawable-mdpi/signed_large.png diff --git a/res/drawable-nodpi-v21/ic_action_delete_dark_vector.xml b/k9mail/src/main/res/drawable-nodpi-v21/ic_action_delete_dark_vector.xml similarity index 100% rename from res/drawable-nodpi-v21/ic_action_delete_dark_vector.xml rename to k9mail/src/main/res/drawable-nodpi-v21/ic_action_delete_dark_vector.xml diff --git a/res/drawable-nodpi-v21/ic_action_mark_as_read_dark_vector.xml b/k9mail/src/main/res/drawable-nodpi-v21/ic_action_mark_as_read_dark_vector.xml similarity index 100% rename from res/drawable-nodpi-v21/ic_action_mark_as_read_dark_vector.xml rename to k9mail/src/main/res/drawable-nodpi-v21/ic_action_mark_as_read_dark_vector.xml diff --git a/res/drawable-nodpi-v21/ic_action_single_message_options_dark_vector.xml b/k9mail/src/main/res/drawable-nodpi-v21/ic_action_single_message_options_dark_vector.xml similarity index 100% rename from res/drawable-nodpi-v21/ic_action_single_message_options_dark_vector.xml rename to k9mail/src/main/res/drawable-nodpi-v21/ic_action_single_message_options_dark_vector.xml diff --git a/res/drawable-nodpi-v21/ic_notify_new_mail_vector.xml b/k9mail/src/main/res/drawable-nodpi-v21/ic_notify_new_mail_vector.xml similarity index 100% rename from res/drawable-nodpi-v21/ic_notify_new_mail_vector.xml rename to k9mail/src/main/res/drawable-nodpi-v21/ic_notify_new_mail_vector.xml diff --git a/res/drawable-xhdpi/action_search_folder_dark.png b/k9mail/src/main/res/drawable-xhdpi/action_search_folder_dark.png similarity index 100% rename from res/drawable-xhdpi/action_search_folder_dark.png rename to k9mail/src/main/res/drawable-xhdpi/action_search_folder_dark.png diff --git a/res/drawable-xhdpi/action_search_folder_light.png b/k9mail/src/main/res/drawable-xhdpi/action_search_folder_light.png similarity index 100% rename from res/drawable-xhdpi/action_search_folder_light.png rename to k9mail/src/main/res/drawable-xhdpi/action_search_folder_light.png diff --git a/res/drawable-xhdpi/btn_check_off_normal_holo_dark.png b/k9mail/src/main/res/drawable-xhdpi/btn_check_off_normal_holo_dark.png similarity index 100% rename from res/drawable-xhdpi/btn_check_off_normal_holo_dark.png rename to k9mail/src/main/res/drawable-xhdpi/btn_check_off_normal_holo_dark.png diff --git a/res/drawable-xhdpi/btn_check_off_normal_holo_light.png b/k9mail/src/main/res/drawable-xhdpi/btn_check_off_normal_holo_light.png similarity index 100% rename from res/drawable-xhdpi/btn_check_off_normal_holo_light.png rename to k9mail/src/main/res/drawable-xhdpi/btn_check_off_normal_holo_light.png diff --git a/res/drawable-xhdpi/btn_check_on_normal_holo_dark.png b/k9mail/src/main/res/drawable-xhdpi/btn_check_on_normal_holo_dark.png similarity index 100% rename from res/drawable-xhdpi/btn_check_on_normal_holo_dark.png rename to k9mail/src/main/res/drawable-xhdpi/btn_check_on_normal_holo_dark.png diff --git a/res/drawable-xhdpi/btn_check_on_normal_holo_light.png b/k9mail/src/main/res/drawable-xhdpi/btn_check_on_normal_holo_light.png similarity index 100% rename from res/drawable-xhdpi/btn_check_on_normal_holo_light.png rename to k9mail/src/main/res/drawable-xhdpi/btn_check_on_normal_holo_light.png diff --git a/res/drawable-xhdpi/dropdown_ic_arrow_normal_holo_dark.png b/k9mail/src/main/res/drawable-xhdpi/dropdown_ic_arrow_normal_holo_dark.png similarity index 100% rename from res/drawable-xhdpi/dropdown_ic_arrow_normal_holo_dark.png rename to k9mail/src/main/res/drawable-xhdpi/dropdown_ic_arrow_normal_holo_dark.png diff --git a/res/drawable-xhdpi/dropdown_ic_arrow_normal_holo_light.png b/k9mail/src/main/res/drawable-xhdpi/dropdown_ic_arrow_normal_holo_light.png similarity index 100% rename from res/drawable-xhdpi/dropdown_ic_arrow_normal_holo_light.png rename to k9mail/src/main/res/drawable-xhdpi/dropdown_ic_arrow_normal_holo_light.png diff --git a/res/drawable-xhdpi/folder_dark.png b/k9mail/src/main/res/drawable-xhdpi/folder_dark.png similarity index 100% rename from res/drawable-xhdpi/folder_dark.png rename to k9mail/src/main/res/drawable-xhdpi/folder_dark.png diff --git a/res/drawable-xhdpi/folder_light.png b/k9mail/src/main/res/drawable-xhdpi/folder_light.png similarity index 100% rename from res/drawable-xhdpi/folder_light.png rename to k9mail/src/main/res/drawable-xhdpi/folder_light.png diff --git a/res/drawable-xhdpi/ic_action_about_dark.png b/k9mail/src/main/res/drawable-xhdpi/ic_action_about_dark.png similarity index 100% rename from res/drawable-xhdpi/ic_action_about_dark.png rename to k9mail/src/main/res/drawable-xhdpi/ic_action_about_dark.png diff --git a/res/drawable-xhdpi/ic_action_about_light.png b/k9mail/src/main/res/drawable-xhdpi/ic_action_about_light.png similarity index 100% rename from res/drawable-xhdpi/ic_action_about_light.png rename to k9mail/src/main/res/drawable-xhdpi/ic_action_about_light.png diff --git a/res/drawable-xhdpi/ic_action_add_attachment_dark.png b/k9mail/src/main/res/drawable-xhdpi/ic_action_add_attachment_dark.png similarity index 100% rename from res/drawable-xhdpi/ic_action_add_attachment_dark.png rename to k9mail/src/main/res/drawable-xhdpi/ic_action_add_attachment_dark.png diff --git a/res/drawable-xhdpi/ic_action_add_attachment_light.png b/k9mail/src/main/res/drawable-xhdpi/ic_action_add_attachment_light.png similarity index 100% rename from res/drawable-xhdpi/ic_action_add_attachment_light.png rename to k9mail/src/main/res/drawable-xhdpi/ic_action_add_attachment_light.png diff --git a/res/drawable-xhdpi/ic_action_add_cc_bbc_light.png b/k9mail/src/main/res/drawable-xhdpi/ic_action_add_cc_bbc_light.png similarity index 100% rename from res/drawable-xhdpi/ic_action_add_cc_bbc_light.png rename to k9mail/src/main/res/drawable-xhdpi/ic_action_add_cc_bbc_light.png diff --git a/res/drawable-xhdpi/ic_action_add_cc_bcc_dark.png b/k9mail/src/main/res/drawable-xhdpi/ic_action_add_cc_bcc_dark.png similarity index 100% rename from res/drawable-xhdpi/ic_action_add_cc_bcc_dark.png rename to k9mail/src/main/res/drawable-xhdpi/ic_action_add_cc_bcc_dark.png diff --git a/res/drawable-xhdpi/ic_action_add_dark.png b/k9mail/src/main/res/drawable-xhdpi/ic_action_add_dark.png similarity index 100% rename from res/drawable-xhdpi/ic_action_add_dark.png rename to k9mail/src/main/res/drawable-xhdpi/ic_action_add_dark.png diff --git a/res/drawable-xhdpi/ic_action_add_light.png b/k9mail/src/main/res/drawable-xhdpi/ic_action_add_light.png similarity index 100% rename from res/drawable-xhdpi/ic_action_add_light.png rename to k9mail/src/main/res/drawable-xhdpi/ic_action_add_light.png diff --git a/res/drawable-xhdpi/ic_action_archive_dark.png b/k9mail/src/main/res/drawable-xhdpi/ic_action_archive_dark.png similarity index 100% rename from res/drawable-xhdpi/ic_action_archive_dark.png rename to k9mail/src/main/res/drawable-xhdpi/ic_action_archive_dark.png diff --git a/res/drawable-xhdpi/ic_action_archive_light.png b/k9mail/src/main/res/drawable-xhdpi/ic_action_archive_light.png similarity index 100% rename from res/drawable-xhdpi/ic_action_archive_light.png rename to k9mail/src/main/res/drawable-xhdpi/ic_action_archive_light.png diff --git a/res/drawable-xhdpi/ic_action_cancel_dark.png b/k9mail/src/main/res/drawable-xhdpi/ic_action_cancel_dark.png similarity index 100% rename from res/drawable-xhdpi/ic_action_cancel_dark.png rename to k9mail/src/main/res/drawable-xhdpi/ic_action_cancel_dark.png diff --git a/res/drawable-xhdpi/ic_action_cancel_light.png b/k9mail/src/main/res/drawable-xhdpi/ic_action_cancel_light.png similarity index 100% rename from res/drawable-xhdpi/ic_action_cancel_light.png rename to k9mail/src/main/res/drawable-xhdpi/ic_action_cancel_light.png diff --git a/res/drawable-xhdpi/ic_action_collapse_dark.png b/k9mail/src/main/res/drawable-xhdpi/ic_action_collapse_dark.png similarity index 100% rename from res/drawable-xhdpi/ic_action_collapse_dark.png rename to k9mail/src/main/res/drawable-xhdpi/ic_action_collapse_dark.png diff --git a/res/drawable-xhdpi/ic_action_collapse_light.png b/k9mail/src/main/res/drawable-xhdpi/ic_action_collapse_light.png similarity index 100% rename from res/drawable-xhdpi/ic_action_collapse_light.png rename to k9mail/src/main/res/drawable-xhdpi/ic_action_collapse_light.png diff --git a/res/drawable-xhdpi/ic_action_compose_dark.png b/k9mail/src/main/res/drawable-xhdpi/ic_action_compose_dark.png similarity index 100% rename from res/drawable-xhdpi/ic_action_compose_dark.png rename to k9mail/src/main/res/drawable-xhdpi/ic_action_compose_dark.png diff --git a/res/drawable-xhdpi/ic_action_compose_light.png b/k9mail/src/main/res/drawable-xhdpi/ic_action_compose_light.png similarity index 100% rename from res/drawable-xhdpi/ic_action_compose_light.png rename to k9mail/src/main/res/drawable-xhdpi/ic_action_compose_light.png diff --git a/res/drawable-xhdpi/ic_action_copy_dark.png b/k9mail/src/main/res/drawable-xhdpi/ic_action_copy_dark.png similarity index 100% rename from res/drawable-xhdpi/ic_action_copy_dark.png rename to k9mail/src/main/res/drawable-xhdpi/ic_action_copy_dark.png diff --git a/res/drawable-xhdpi/ic_action_copy_light.png b/k9mail/src/main/res/drawable-xhdpi/ic_action_copy_light.png similarity index 100% rename from res/drawable-xhdpi/ic_action_copy_light.png rename to k9mail/src/main/res/drawable-xhdpi/ic_action_copy_light.png diff --git a/res/drawable-xhdpi/ic_action_delete_dark.png b/k9mail/src/main/res/drawable-xhdpi/ic_action_delete_dark.png similarity index 100% rename from res/drawable-xhdpi/ic_action_delete_dark.png rename to k9mail/src/main/res/drawable-xhdpi/ic_action_delete_dark.png diff --git a/res/drawable-xhdpi/ic_action_delete_light.png b/k9mail/src/main/res/drawable-xhdpi/ic_action_delete_light.png similarity index 100% rename from res/drawable-xhdpi/ic_action_delete_light.png rename to k9mail/src/main/res/drawable-xhdpi/ic_action_delete_light.png diff --git a/res/drawable-xhdpi/ic_action_expand_dark.png b/k9mail/src/main/res/drawable-xhdpi/ic_action_expand_dark.png similarity index 100% rename from res/drawable-xhdpi/ic_action_expand_dark.png rename to k9mail/src/main/res/drawable-xhdpi/ic_action_expand_dark.png diff --git a/res/drawable-xhdpi/ic_action_expand_light.png b/k9mail/src/main/res/drawable-xhdpi/ic_action_expand_light.png similarity index 100% rename from res/drawable-xhdpi/ic_action_expand_light.png rename to k9mail/src/main/res/drawable-xhdpi/ic_action_expand_light.png diff --git a/res/drawable-xhdpi/ic_action_flag_dark.png b/k9mail/src/main/res/drawable-xhdpi/ic_action_flag_dark.png similarity index 100% rename from res/drawable-xhdpi/ic_action_flag_dark.png rename to k9mail/src/main/res/drawable-xhdpi/ic_action_flag_dark.png diff --git a/res/drawable-xhdpi/ic_action_flag_light.png b/k9mail/src/main/res/drawable-xhdpi/ic_action_flag_light.png similarity index 100% rename from res/drawable-xhdpi/ic_action_flag_light.png rename to k9mail/src/main/res/drawable-xhdpi/ic_action_flag_light.png diff --git a/res/drawable-xhdpi/ic_action_import_export_dark.png b/k9mail/src/main/res/drawable-xhdpi/ic_action_import_export_dark.png similarity index 100% rename from res/drawable-xhdpi/ic_action_import_export_dark.png rename to k9mail/src/main/res/drawable-xhdpi/ic_action_import_export_dark.png diff --git a/res/drawable-xhdpi/ic_action_import_export_light.png b/k9mail/src/main/res/drawable-xhdpi/ic_action_import_export_light.png similarity index 100% rename from res/drawable-xhdpi/ic_action_import_export_light.png rename to k9mail/src/main/res/drawable-xhdpi/ic_action_import_export_light.png diff --git a/res/drawable-xhdpi/ic_action_mark_as_read_dark.png b/k9mail/src/main/res/drawable-xhdpi/ic_action_mark_as_read_dark.png similarity index 100% rename from res/drawable-xhdpi/ic_action_mark_as_read_dark.png rename to k9mail/src/main/res/drawable-xhdpi/ic_action_mark_as_read_dark.png diff --git a/res/drawable-xhdpi/ic_action_mark_as_read_light.png b/k9mail/src/main/res/drawable-xhdpi/ic_action_mark_as_read_light.png similarity index 100% rename from res/drawable-xhdpi/ic_action_mark_as_read_light.png rename to k9mail/src/main/res/drawable-xhdpi/ic_action_mark_as_read_light.png diff --git a/res/drawable-xhdpi/ic_action_mark_as_unread_dark.png b/k9mail/src/main/res/drawable-xhdpi/ic_action_mark_as_unread_dark.png similarity index 100% rename from res/drawable-xhdpi/ic_action_mark_as_unread_dark.png rename to k9mail/src/main/res/drawable-xhdpi/ic_action_mark_as_unread_dark.png diff --git a/res/drawable-xhdpi/ic_action_mark_as_unread_light.png b/k9mail/src/main/res/drawable-xhdpi/ic_action_mark_as_unread_light.png similarity index 100% rename from res/drawable-xhdpi/ic_action_mark_as_unread_light.png rename to k9mail/src/main/res/drawable-xhdpi/ic_action_mark_as_unread_light.png diff --git a/res/drawable-xhdpi/ic_action_move_dark.png b/k9mail/src/main/res/drawable-xhdpi/ic_action_move_dark.png similarity index 100% rename from res/drawable-xhdpi/ic_action_move_dark.png rename to k9mail/src/main/res/drawable-xhdpi/ic_action_move_dark.png diff --git a/res/drawable-xhdpi/ic_action_move_light.png b/k9mail/src/main/res/drawable-xhdpi/ic_action_move_light.png similarity index 100% rename from res/drawable-xhdpi/ic_action_move_light.png rename to k9mail/src/main/res/drawable-xhdpi/ic_action_move_light.png diff --git a/res/drawable-xhdpi/ic_action_next_message_dark.png b/k9mail/src/main/res/drawable-xhdpi/ic_action_next_message_dark.png similarity index 100% rename from res/drawable-xhdpi/ic_action_next_message_dark.png rename to k9mail/src/main/res/drawable-xhdpi/ic_action_next_message_dark.png diff --git a/res/drawable-xhdpi/ic_action_next_message_light.png b/k9mail/src/main/res/drawable-xhdpi/ic_action_next_message_light.png similarity index 100% rename from res/drawable-xhdpi/ic_action_next_message_light.png rename to k9mail/src/main/res/drawable-xhdpi/ic_action_next_message_light.png diff --git a/res/drawable-xhdpi/ic_action_previous_message_dark.png b/k9mail/src/main/res/drawable-xhdpi/ic_action_previous_message_dark.png similarity index 100% rename from res/drawable-xhdpi/ic_action_previous_message_dark.png rename to k9mail/src/main/res/drawable-xhdpi/ic_action_previous_message_dark.png diff --git a/res/drawable-xhdpi/ic_action_previous_message_light.png b/k9mail/src/main/res/drawable-xhdpi/ic_action_previous_message_light.png similarity index 100% rename from res/drawable-xhdpi/ic_action_previous_message_light.png rename to k9mail/src/main/res/drawable-xhdpi/ic_action_previous_message_light.png diff --git a/res/drawable-xhdpi/ic_action_refresh_dark.png b/k9mail/src/main/res/drawable-xhdpi/ic_action_refresh_dark.png similarity index 100% rename from res/drawable-xhdpi/ic_action_refresh_dark.png rename to k9mail/src/main/res/drawable-xhdpi/ic_action_refresh_dark.png diff --git a/res/drawable-xhdpi/ic_action_refresh_light.png b/k9mail/src/main/res/drawable-xhdpi/ic_action_refresh_light.png similarity index 100% rename from res/drawable-xhdpi/ic_action_refresh_light.png rename to k9mail/src/main/res/drawable-xhdpi/ic_action_refresh_light.png diff --git a/res/drawable-xhdpi/ic_action_remote_search_dark.png b/k9mail/src/main/res/drawable-xhdpi/ic_action_remote_search_dark.png similarity index 100% rename from res/drawable-xhdpi/ic_action_remote_search_dark.png rename to k9mail/src/main/res/drawable-xhdpi/ic_action_remote_search_dark.png diff --git a/res/drawable-xhdpi/ic_action_remote_search_light.png b/k9mail/src/main/res/drawable-xhdpi/ic_action_remote_search_light.png similarity index 100% rename from res/drawable-xhdpi/ic_action_remote_search_light.png rename to k9mail/src/main/res/drawable-xhdpi/ic_action_remote_search_light.png diff --git a/res/drawable-xhdpi/ic_action_request_read_receipt_dark.png b/k9mail/src/main/res/drawable-xhdpi/ic_action_request_read_receipt_dark.png similarity index 100% rename from res/drawable-xhdpi/ic_action_request_read_receipt_dark.png rename to k9mail/src/main/res/drawable-xhdpi/ic_action_request_read_receipt_dark.png diff --git a/res/drawable-xhdpi/ic_action_request_read_receipt_light.png b/k9mail/src/main/res/drawable-xhdpi/ic_action_request_read_receipt_light.png similarity index 100% rename from res/drawable-xhdpi/ic_action_request_read_receipt_light.png rename to k9mail/src/main/res/drawable-xhdpi/ic_action_request_read_receipt_light.png diff --git a/res/drawable-xhdpi/ic_action_save_dark.png b/k9mail/src/main/res/drawable-xhdpi/ic_action_save_dark.png similarity index 100% rename from res/drawable-xhdpi/ic_action_save_dark.png rename to k9mail/src/main/res/drawable-xhdpi/ic_action_save_dark.png diff --git a/res/drawable-xhdpi/ic_action_save_light.png b/k9mail/src/main/res/drawable-xhdpi/ic_action_save_light.png similarity index 100% rename from res/drawable-xhdpi/ic_action_save_light.png rename to k9mail/src/main/res/drawable-xhdpi/ic_action_save_light.png diff --git a/res/drawable-xhdpi/ic_action_search_dark.png b/k9mail/src/main/res/drawable-xhdpi/ic_action_search_dark.png similarity index 100% rename from res/drawable-xhdpi/ic_action_search_dark.png rename to k9mail/src/main/res/drawable-xhdpi/ic_action_search_dark.png diff --git a/res/drawable-xhdpi/ic_action_search_light.png b/k9mail/src/main/res/drawable-xhdpi/ic_action_search_light.png similarity index 100% rename from res/drawable-xhdpi/ic_action_search_light.png rename to k9mail/src/main/res/drawable-xhdpi/ic_action_search_light.png diff --git a/res/drawable-xhdpi/ic_action_select_all_dark.png b/k9mail/src/main/res/drawable-xhdpi/ic_action_select_all_dark.png similarity index 100% rename from res/drawable-xhdpi/ic_action_select_all_dark.png rename to k9mail/src/main/res/drawable-xhdpi/ic_action_select_all_dark.png diff --git a/res/drawable-xhdpi/ic_action_select_all_light.png b/k9mail/src/main/res/drawable-xhdpi/ic_action_select_all_light.png similarity index 100% rename from res/drawable-xhdpi/ic_action_select_all_light.png rename to k9mail/src/main/res/drawable-xhdpi/ic_action_select_all_light.png diff --git a/res/drawable-xhdpi/ic_action_send_dark.png b/k9mail/src/main/res/drawable-xhdpi/ic_action_send_dark.png similarity index 100% rename from res/drawable-xhdpi/ic_action_send_dark.png rename to k9mail/src/main/res/drawable-xhdpi/ic_action_send_dark.png diff --git a/res/drawable-xhdpi/ic_action_send_light.png b/k9mail/src/main/res/drawable-xhdpi/ic_action_send_light.png similarity index 100% rename from res/drawable-xhdpi/ic_action_send_light.png rename to k9mail/src/main/res/drawable-xhdpi/ic_action_send_light.png diff --git a/res/drawable-xhdpi/ic_action_settings_dark.png b/k9mail/src/main/res/drawable-xhdpi/ic_action_settings_dark.png similarity index 100% rename from res/drawable-xhdpi/ic_action_settings_dark.png rename to k9mail/src/main/res/drawable-xhdpi/ic_action_settings_dark.png diff --git a/res/drawable-xhdpi/ic_action_settings_light.png b/k9mail/src/main/res/drawable-xhdpi/ic_action_settings_light.png similarity index 100% rename from res/drawable-xhdpi/ic_action_settings_light.png rename to k9mail/src/main/res/drawable-xhdpi/ic_action_settings_light.png diff --git a/res/drawable-xhdpi/ic_action_single_message_options_dark.png b/k9mail/src/main/res/drawable-xhdpi/ic_action_single_message_options_dark.png similarity index 100% rename from res/drawable-xhdpi/ic_action_single_message_options_dark.png rename to k9mail/src/main/res/drawable-xhdpi/ic_action_single_message_options_dark.png diff --git a/res/drawable-xhdpi/ic_action_single_message_options_light.png b/k9mail/src/main/res/drawable-xhdpi/ic_action_single_message_options_light.png similarity index 100% rename from res/drawable-xhdpi/ic_action_single_message_options_light.png rename to k9mail/src/main/res/drawable-xhdpi/ic_action_single_message_options_light.png diff --git a/res/drawable-xhdpi/ic_action_sort_dark.png b/k9mail/src/main/res/drawable-xhdpi/ic_action_sort_dark.png similarity index 100% rename from res/drawable-xhdpi/ic_action_sort_dark.png rename to k9mail/src/main/res/drawable-xhdpi/ic_action_sort_dark.png diff --git a/res/drawable-xhdpi/ic_action_sort_light.png b/k9mail/src/main/res/drawable-xhdpi/ic_action_sort_light.png similarity index 100% rename from res/drawable-xhdpi/ic_action_sort_light.png rename to k9mail/src/main/res/drawable-xhdpi/ic_action_sort_light.png diff --git a/res/drawable-xhdpi/ic_action_spam_dark.png b/k9mail/src/main/res/drawable-xhdpi/ic_action_spam_dark.png similarity index 100% rename from res/drawable-xhdpi/ic_action_spam_dark.png rename to k9mail/src/main/res/drawable-xhdpi/ic_action_spam_dark.png diff --git a/res/drawable-xhdpi/ic_action_spam_light.png b/k9mail/src/main/res/drawable-xhdpi/ic_action_spam_light.png similarity index 100% rename from res/drawable-xhdpi/ic_action_spam_light.png rename to k9mail/src/main/res/drawable-xhdpi/ic_action_spam_light.png diff --git a/res/drawable-xhdpi/ic_action_unflag_dark.png b/k9mail/src/main/res/drawable-xhdpi/ic_action_unflag_dark.png similarity index 100% rename from res/drawable-xhdpi/ic_action_unflag_dark.png rename to k9mail/src/main/res/drawable-xhdpi/ic_action_unflag_dark.png diff --git a/res/drawable-xhdpi/ic_action_unflag_light.png b/k9mail/src/main/res/drawable-xhdpi/ic_action_unflag_light.png similarity index 100% rename from res/drawable-xhdpi/ic_action_unflag_light.png rename to k9mail/src/main/res/drawable-xhdpi/ic_action_unflag_light.png diff --git a/res/drawable-xhdpi/ic_action_upload_dark.png b/k9mail/src/main/res/drawable-xhdpi/ic_action_upload_dark.png similarity index 100% rename from res/drawable-xhdpi/ic_action_upload_dark.png rename to k9mail/src/main/res/drawable-xhdpi/ic_action_upload_dark.png diff --git a/res/drawable-xhdpi/ic_action_upload_light.png b/k9mail/src/main/res/drawable-xhdpi/ic_action_upload_light.png similarity index 100% rename from res/drawable-xhdpi/ic_action_upload_light.png rename to k9mail/src/main/res/drawable-xhdpi/ic_action_upload_light.png diff --git a/res/drawable-xhdpi/ic_button_add_contact_dark.png b/k9mail/src/main/res/drawable-xhdpi/ic_button_add_contact_dark.png similarity index 100% rename from res/drawable-xhdpi/ic_button_add_contact_dark.png rename to k9mail/src/main/res/drawable-xhdpi/ic_button_add_contact_dark.png diff --git a/res/drawable-xhdpi/ic_button_add_contact_light.png b/k9mail/src/main/res/drawable-xhdpi/ic_button_add_contact_light.png similarity index 100% rename from res/drawable-xhdpi/ic_button_add_contact_light.png rename to k9mail/src/main/res/drawable-xhdpi/ic_button_add_contact_light.png diff --git a/res/drawable-xhdpi/ic_contact_picture.png b/k9mail/src/main/res/drawable-xhdpi/ic_contact_picture.png similarity index 100% rename from res/drawable-xhdpi/ic_contact_picture.png rename to k9mail/src/main/res/drawable-xhdpi/ic_contact_picture.png diff --git a/res/drawable-xhdpi/ic_notify_check_mail_anim_0.png b/k9mail/src/main/res/drawable-xhdpi/ic_notify_check_mail_anim_0.png similarity index 100% rename from res/drawable-xhdpi/ic_notify_check_mail_anim_0.png rename to k9mail/src/main/res/drawable-xhdpi/ic_notify_check_mail_anim_0.png diff --git a/res/drawable-xhdpi/ic_notify_check_mail_anim_1.png b/k9mail/src/main/res/drawable-xhdpi/ic_notify_check_mail_anim_1.png similarity index 100% rename from res/drawable-xhdpi/ic_notify_check_mail_anim_1.png rename to k9mail/src/main/res/drawable-xhdpi/ic_notify_check_mail_anim_1.png diff --git a/res/drawable-xhdpi/ic_notify_check_mail_anim_2.png b/k9mail/src/main/res/drawable-xhdpi/ic_notify_check_mail_anim_2.png similarity index 100% rename from res/drawable-xhdpi/ic_notify_check_mail_anim_2.png rename to k9mail/src/main/res/drawable-xhdpi/ic_notify_check_mail_anim_2.png diff --git a/res/drawable-xhdpi/ic_notify_check_mail_anim_3.png b/k9mail/src/main/res/drawable-xhdpi/ic_notify_check_mail_anim_3.png similarity index 100% rename from res/drawable-xhdpi/ic_notify_check_mail_anim_3.png rename to k9mail/src/main/res/drawable-xhdpi/ic_notify_check_mail_anim_3.png diff --git a/res/drawable-xhdpi/ic_notify_check_mail_anim_4.png b/k9mail/src/main/res/drawable-xhdpi/ic_notify_check_mail_anim_4.png similarity index 100% rename from res/drawable-xhdpi/ic_notify_check_mail_anim_4.png rename to k9mail/src/main/res/drawable-xhdpi/ic_notify_check_mail_anim_4.png diff --git a/res/drawable-xhdpi/ic_notify_check_mail_anim_5.png b/k9mail/src/main/res/drawable-xhdpi/ic_notify_check_mail_anim_5.png similarity index 100% rename from res/drawable-xhdpi/ic_notify_check_mail_anim_5.png rename to k9mail/src/main/res/drawable-xhdpi/ic_notify_check_mail_anim_5.png diff --git a/res/drawable-xhdpi/ic_notify_new_mail.png b/k9mail/src/main/res/drawable-xhdpi/ic_notify_new_mail.png similarity index 100% rename from res/drawable-xhdpi/ic_notify_new_mail.png rename to k9mail/src/main/res/drawable-xhdpi/ic_notify_new_mail.png diff --git a/res/drawable-xhdpi/ic_unread_widget.png b/k9mail/src/main/res/drawable-xhdpi/ic_unread_widget.png similarity index 100% rename from res/drawable-xhdpi/ic_unread_widget.png rename to k9mail/src/main/res/drawable-xhdpi/ic_unread_widget.png diff --git a/res/drawable-xhdpi/ic_unread_widget_selected.png b/k9mail/src/main/res/drawable-xhdpi/ic_unread_widget_selected.png similarity index 100% rename from res/drawable-xhdpi/ic_unread_widget_selected.png rename to k9mail/src/main/res/drawable-xhdpi/ic_unread_widget_selected.png diff --git a/res/drawable-xhdpi/icon.png b/k9mail/src/main/res/drawable-xhdpi/icon.png similarity index 100% rename from res/drawable-xhdpi/icon.png rename to k9mail/src/main/res/drawable-xhdpi/icon.png diff --git a/res/drawable-xhdpi/item_focused.9.png b/k9mail/src/main/res/drawable-xhdpi/item_focused.9.png similarity index 100% rename from res/drawable-xhdpi/item_focused.9.png rename to k9mail/src/main/res/drawable-xhdpi/item_focused.9.png diff --git a/res/drawable-xhdpi/item_pressed.9.png b/k9mail/src/main/res/drawable-xhdpi/item_pressed.9.png similarity index 100% rename from res/drawable-xhdpi/item_pressed.9.png rename to k9mail/src/main/res/drawable-xhdpi/item_pressed.9.png diff --git a/res/drawable-xxhdpi/ic_action_collapse_dark.png b/k9mail/src/main/res/drawable-xxhdpi/ic_action_collapse_dark.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_collapse_dark.png rename to k9mail/src/main/res/drawable-xxhdpi/ic_action_collapse_dark.png diff --git a/res/drawable-xxhdpi/ic_action_collapse_light.png b/k9mail/src/main/res/drawable-xxhdpi/ic_action_collapse_light.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_collapse_light.png rename to k9mail/src/main/res/drawable-xxhdpi/ic_action_collapse_light.png diff --git a/res/drawable-xxhdpi/ic_action_expand_dark.png b/k9mail/src/main/res/drawable-xxhdpi/ic_action_expand_dark.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_expand_dark.png rename to k9mail/src/main/res/drawable-xxhdpi/ic_action_expand_dark.png diff --git a/res/drawable-xxhdpi/ic_action_expand_light.png b/k9mail/src/main/res/drawable-xxhdpi/ic_action_expand_light.png similarity index 100% rename from res/drawable-xxhdpi/ic_action_expand_light.png rename to k9mail/src/main/res/drawable-xxhdpi/ic_action_expand_light.png diff --git a/res/drawable-xxhdpi/icon.png b/k9mail/src/main/res/drawable-xxhdpi/icon.png similarity index 100% rename from res/drawable-xxhdpi/icon.png rename to k9mail/src/main/res/drawable-xxhdpi/icon.png diff --git a/res/drawable-xxxhdpi/icon.png b/k9mail/src/main/res/drawable-xxxhdpi/icon.png similarity index 100% rename from res/drawable-xxxhdpi/icon.png rename to k9mail/src/main/res/drawable-xxxhdpi/icon.png diff --git a/res/drawable/btn_check_message_list_dark.xml b/k9mail/src/main/res/drawable/btn_check_message_list_dark.xml similarity index 100% rename from res/drawable/btn_check_message_list_dark.xml rename to k9mail/src/main/res/drawable/btn_check_message_list_dark.xml diff --git a/res/drawable/btn_check_message_list_light.xml b/k9mail/src/main/res/drawable/btn_check_message_list_light.xml similarity index 100% rename from res/drawable/btn_check_message_list_light.xml rename to k9mail/src/main/res/drawable/btn_check_message_list_light.xml diff --git a/res/drawable/btn_dialog.xml b/k9mail/src/main/res/drawable/btn_dialog.xml similarity index 100% rename from res/drawable/btn_dialog.xml rename to k9mail/src/main/res/drawable/btn_dialog.xml diff --git a/res/drawable/btn_edit.xml b/k9mail/src/main/res/drawable/btn_edit.xml similarity index 100% rename from res/drawable/btn_edit.xml rename to k9mail/src/main/res/drawable/btn_edit.xml diff --git a/res/drawable/ic_notify_check_mail.xml b/k9mail/src/main/res/drawable/ic_notify_check_mail.xml similarity index 100% rename from res/drawable/ic_notify_check_mail.xml rename to k9mail/src/main/res/drawable/ic_notify_check_mail.xml diff --git a/res/drawable/message_list_item_footer_background.xml b/k9mail/src/main/res/drawable/message_list_item_footer_background.xml similarity index 100% rename from res/drawable/message_list_item_footer_background.xml rename to k9mail/src/main/res/drawable/message_list_item_footer_background.xml diff --git a/res/drawable/rounded_corners.xml b/k9mail/src/main/res/drawable/rounded_corners.xml similarity index 100% rename from res/drawable/rounded_corners.xml rename to k9mail/src/main/res/drawable/rounded_corners.xml diff --git a/res/drawable/selectable_item_background.xml b/k9mail/src/main/res/drawable/selectable_item_background.xml similarity index 100% rename from res/drawable/selectable_item_background.xml rename to k9mail/src/main/res/drawable/selectable_item_background.xml diff --git a/res/drawable/thread_count_box_dark.xml b/k9mail/src/main/res/drawable/thread_count_box_dark.xml similarity index 100% rename from res/drawable/thread_count_box_dark.xml rename to k9mail/src/main/res/drawable/thread_count_box_dark.xml diff --git a/res/drawable/thread_count_box_light.xml b/k9mail/src/main/res/drawable/thread_count_box_light.xml similarity index 100% rename from res/drawable/thread_count_box_light.xml rename to k9mail/src/main/res/drawable/thread_count_box_light.xml diff --git a/res/drawable/unread_count_background.xml b/k9mail/src/main/res/drawable/unread_count_background.xml similarity index 100% rename from res/drawable/unread_count_background.xml rename to k9mail/src/main/res/drawable/unread_count_background.xml diff --git a/res/drawable/unread_widget_background.xml b/k9mail/src/main/res/drawable/unread_widget_background.xml similarity index 100% rename from res/drawable/unread_widget_background.xml rename to k9mail/src/main/res/drawable/unread_widget_background.xml diff --git a/res/drawable/unread_widget_icon.xml b/k9mail/src/main/res/drawable/unread_widget_icon.xml similarity index 100% rename from res/drawable/unread_widget_icon.xml rename to k9mail/src/main/res/drawable/unread_widget_icon.xml diff --git a/res/layout-land/actionbar_custom.xml b/k9mail/src/main/res/layout-land/actionbar_custom.xml similarity index 100% rename from res/layout-land/actionbar_custom.xml rename to k9mail/src/main/res/layout-land/actionbar_custom.xml diff --git a/res/layout/accessible_email_content.xml b/k9mail/src/main/res/layout/accessible_email_content.xml similarity index 100% rename from res/layout/accessible_email_content.xml rename to k9mail/src/main/res/layout/accessible_email_content.xml diff --git a/res/layout/account_list.xml b/k9mail/src/main/res/layout/account_list.xml similarity index 100% rename from res/layout/account_list.xml rename to k9mail/src/main/res/layout/account_list.xml diff --git a/res/layout/account_setup_account_type.xml b/k9mail/src/main/res/layout/account_setup_account_type.xml similarity index 100% rename from res/layout/account_setup_account_type.xml rename to k9mail/src/main/res/layout/account_setup_account_type.xml diff --git a/res/layout/account_setup_basics.xml b/k9mail/src/main/res/layout/account_setup_basics.xml similarity index 100% rename from res/layout/account_setup_basics.xml rename to k9mail/src/main/res/layout/account_setup_basics.xml diff --git a/res/layout/account_setup_check_settings.xml b/k9mail/src/main/res/layout/account_setup_check_settings.xml similarity index 100% rename from res/layout/account_setup_check_settings.xml rename to k9mail/src/main/res/layout/account_setup_check_settings.xml diff --git a/res/layout/account_setup_composition.xml b/k9mail/src/main/res/layout/account_setup_composition.xml similarity index 100% rename from res/layout/account_setup_composition.xml rename to k9mail/src/main/res/layout/account_setup_composition.xml diff --git a/res/layout/account_setup_incoming.xml b/k9mail/src/main/res/layout/account_setup_incoming.xml similarity index 100% rename from res/layout/account_setup_incoming.xml rename to k9mail/src/main/res/layout/account_setup_incoming.xml diff --git a/res/layout/account_setup_names.xml b/k9mail/src/main/res/layout/account_setup_names.xml similarity index 100% rename from res/layout/account_setup_names.xml rename to k9mail/src/main/res/layout/account_setup_names.xml diff --git a/res/layout/account_setup_options.xml b/k9mail/src/main/res/layout/account_setup_options.xml similarity index 100% rename from res/layout/account_setup_options.xml rename to k9mail/src/main/res/layout/account_setup_options.xml diff --git a/res/layout/account_setup_outgoing.xml b/k9mail/src/main/res/layout/account_setup_outgoing.xml similarity index 100% rename from res/layout/account_setup_outgoing.xml rename to k9mail/src/main/res/layout/account_setup_outgoing.xml diff --git a/res/layout/accounts.xml b/k9mail/src/main/res/layout/accounts.xml similarity index 100% rename from res/layout/accounts.xml rename to k9mail/src/main/res/layout/accounts.xml diff --git a/res/layout/accounts_folders_icons.xml b/k9mail/src/main/res/layout/accounts_folders_icons.xml similarity index 100% rename from res/layout/accounts_folders_icons.xml rename to k9mail/src/main/res/layout/accounts_folders_icons.xml diff --git a/res/layout/accounts_item.xml b/k9mail/src/main/res/layout/accounts_item.xml similarity index 100% rename from res/layout/accounts_item.xml rename to k9mail/src/main/res/layout/accounts_item.xml diff --git a/res/layout/accounts_password_prompt.xml b/k9mail/src/main/res/layout/accounts_password_prompt.xml similarity index 100% rename from res/layout/accounts_password_prompt.xml rename to k9mail/src/main/res/layout/accounts_password_prompt.xml diff --git a/res/layout/actionbar_custom.xml b/k9mail/src/main/res/layout/actionbar_custom.xml similarity index 100% rename from res/layout/actionbar_custom.xml rename to k9mail/src/main/res/layout/actionbar_custom.xml diff --git a/res/layout/actionbar_indeterminate_progress_actionview.xml b/k9mail/src/main/res/layout/actionbar_indeterminate_progress_actionview.xml similarity index 100% rename from res/layout/actionbar_indeterminate_progress_actionview.xml rename to k9mail/src/main/res/layout/actionbar_indeterminate_progress_actionview.xml diff --git a/res/layout/choose_account_item.xml b/k9mail/src/main/res/layout/choose_account_item.xml similarity index 100% rename from res/layout/choose_account_item.xml rename to k9mail/src/main/res/layout/choose_account_item.xml diff --git a/res/layout/choose_identity_item.xml b/k9mail/src/main/res/layout/choose_identity_item.xml similarity index 100% rename from res/layout/choose_identity_item.xml rename to k9mail/src/main/res/layout/choose_identity_item.xml diff --git a/res/layout/client_certificate_spinner.xml b/k9mail/src/main/res/layout/client_certificate_spinner.xml similarity index 100% rename from res/layout/client_certificate_spinner.xml rename to k9mail/src/main/res/layout/client_certificate_spinner.xml diff --git a/res/layout/color_picker_dialog.xml b/k9mail/src/main/res/layout/color_picker_dialog.xml similarity index 100% rename from res/layout/color_picker_dialog.xml rename to k9mail/src/main/res/layout/color_picker_dialog.xml diff --git a/res/layout/edit_identity.xml b/k9mail/src/main/res/layout/edit_identity.xml similarity index 100% rename from res/layout/edit_identity.xml rename to k9mail/src/main/res/layout/edit_identity.xml diff --git a/res/layout/email_address_list.xml b/k9mail/src/main/res/layout/email_address_list.xml similarity index 100% rename from res/layout/email_address_list.xml rename to k9mail/src/main/res/layout/email_address_list.xml diff --git a/res/layout/email_address_list_item.xml b/k9mail/src/main/res/layout/email_address_list_item.xml similarity index 100% rename from res/layout/email_address_list_item.xml rename to k9mail/src/main/res/layout/email_address_list_item.xml diff --git a/res/layout/empty_message_view.xml b/k9mail/src/main/res/layout/empty_message_view.xml similarity index 100% rename from res/layout/empty_message_view.xml rename to k9mail/src/main/res/layout/empty_message_view.xml diff --git a/res/layout/foldable_linearlayout.xml b/k9mail/src/main/res/layout/foldable_linearlayout.xml similarity index 100% rename from res/layout/foldable_linearlayout.xml rename to k9mail/src/main/res/layout/foldable_linearlayout.xml diff --git a/res/layout/folder_list.xml b/k9mail/src/main/res/layout/folder_list.xml similarity index 100% rename from res/layout/folder_list.xml rename to k9mail/src/main/res/layout/folder_list.xml diff --git a/res/layout/folder_list_item.xml b/k9mail/src/main/res/layout/folder_list_item.xml similarity index 100% rename from res/layout/folder_list_item.xml rename to k9mail/src/main/res/layout/folder_list_item.xml diff --git a/res/layout/list_content_simple.xml b/k9mail/src/main/res/layout/list_content_simple.xml similarity index 100% rename from res/layout/list_content_simple.xml rename to k9mail/src/main/res/layout/list_content_simple.xml diff --git a/res/layout/message.xml b/k9mail/src/main/res/layout/message.xml similarity index 100% rename from res/layout/message.xml rename to k9mail/src/main/res/layout/message.xml diff --git a/res/layout/message_compose.xml b/k9mail/src/main/res/layout/message_compose.xml similarity index 100% rename from res/layout/message_compose.xml rename to k9mail/src/main/res/layout/message_compose.xml diff --git a/res/layout/message_compose_attachment.xml b/k9mail/src/main/res/layout/message_compose_attachment.xml similarity index 100% rename from res/layout/message_compose_attachment.xml rename to k9mail/src/main/res/layout/message_compose_attachment.xml diff --git a/res/layout/message_list.xml b/k9mail/src/main/res/layout/message_list.xml similarity index 100% rename from res/layout/message_list.xml rename to k9mail/src/main/res/layout/message_list.xml diff --git a/res/layout/message_list_fragment.xml b/k9mail/src/main/res/layout/message_list_fragment.xml similarity index 100% rename from res/layout/message_list_fragment.xml rename to k9mail/src/main/res/layout/message_list_fragment.xml diff --git a/res/layout/message_list_item.xml b/k9mail/src/main/res/layout/message_list_item.xml similarity index 100% rename from res/layout/message_list_item.xml rename to k9mail/src/main/res/layout/message_list_item.xml diff --git a/res/layout/message_list_item_footer.xml b/k9mail/src/main/res/layout/message_list_item_footer.xml similarity index 100% rename from res/layout/message_list_item_footer.xml rename to k9mail/src/main/res/layout/message_list_item_footer.xml diff --git a/res/layout/message_list_loading.xml b/k9mail/src/main/res/layout/message_list_loading.xml similarity index 100% rename from res/layout/message_list_loading.xml rename to k9mail/src/main/res/layout/message_list_loading.xml diff --git a/res/layout/message_view_attachment.xml b/k9mail/src/main/res/layout/message_view_attachment.xml similarity index 100% rename from res/layout/message_view_attachment.xml rename to k9mail/src/main/res/layout/message_view_attachment.xml diff --git a/res/layout/message_view_header.xml b/k9mail/src/main/res/layout/message_view_header.xml similarity index 100% rename from res/layout/message_view_header.xml rename to k9mail/src/main/res/layout/message_view_header.xml diff --git a/res/layout/message_view_openpgp_layout.xml b/k9mail/src/main/res/layout/message_view_openpgp_layout.xml similarity index 100% rename from res/layout/message_view_openpgp_layout.xml rename to k9mail/src/main/res/layout/message_view_openpgp_layout.xml diff --git a/res/layout/recipient_dropdown_item.xml b/k9mail/src/main/res/layout/recipient_dropdown_item.xml similarity index 100% rename from res/layout/recipient_dropdown_item.xml rename to k9mail/src/main/res/layout/recipient_dropdown_item.xml diff --git a/res/layout/slider_preference_dialog.xml b/k9mail/src/main/res/layout/slider_preference_dialog.xml similarity index 100% rename from res/layout/slider_preference_dialog.xml rename to k9mail/src/main/res/layout/slider_preference_dialog.xml diff --git a/res/layout/split_message_list.xml b/k9mail/src/main/res/layout/split_message_list.xml similarity index 100% rename from res/layout/split_message_list.xml rename to k9mail/src/main/res/layout/split_message_list.xml diff --git a/res/layout/unread_widget_layout.xml b/k9mail/src/main/res/layout/unread_widget_layout.xml similarity index 100% rename from res/layout/unread_widget_layout.xml rename to k9mail/src/main/res/layout/unread_widget_layout.xml diff --git a/res/layout/upgrade_databases.xml b/k9mail/src/main/res/layout/upgrade_databases.xml similarity index 100% rename from res/layout/upgrade_databases.xml rename to k9mail/src/main/res/layout/upgrade_databases.xml diff --git a/res/layout/welcome_message.xml b/k9mail/src/main/res/layout/welcome_message.xml similarity index 100% rename from res/layout/welcome_message.xml rename to k9mail/src/main/res/layout/welcome_message.xml diff --git a/res/layout/wizard_cancel.xml b/k9mail/src/main/res/layout/wizard_cancel.xml similarity index 100% rename from res/layout/wizard_cancel.xml rename to k9mail/src/main/res/layout/wizard_cancel.xml diff --git a/res/layout/wizard_done.xml b/k9mail/src/main/res/layout/wizard_done.xml similarity index 100% rename from res/layout/wizard_done.xml rename to k9mail/src/main/res/layout/wizard_done.xml diff --git a/res/layout/wizard_next.xml b/k9mail/src/main/res/layout/wizard_next.xml similarity index 100% rename from res/layout/wizard_next.xml rename to k9mail/src/main/res/layout/wizard_next.xml diff --git a/res/layout/wizard_setup.xml b/k9mail/src/main/res/layout/wizard_setup.xml similarity index 100% rename from res/layout/wizard_setup.xml rename to k9mail/src/main/res/layout/wizard_setup.xml diff --git a/res/layout/wizard_welcome.xml b/k9mail/src/main/res/layout/wizard_welcome.xml similarity index 100% rename from res/layout/wizard_welcome.xml rename to k9mail/src/main/res/layout/wizard_welcome.xml diff --git a/res/menu/accounts_context.xml b/k9mail/src/main/res/menu/accounts_context.xml similarity index 100% rename from res/menu/accounts_context.xml rename to k9mail/src/main/res/menu/accounts_context.xml diff --git a/res/menu/accounts_option.xml b/k9mail/src/main/res/menu/accounts_option.xml similarity index 100% rename from res/menu/accounts_option.xml rename to k9mail/src/main/res/menu/accounts_option.xml diff --git a/res/menu/disabled_accounts_context.xml b/k9mail/src/main/res/menu/disabled_accounts_context.xml similarity index 100% rename from res/menu/disabled_accounts_context.xml rename to k9mail/src/main/res/menu/disabled_accounts_context.xml diff --git a/res/menu/folder_context.xml b/k9mail/src/main/res/menu/folder_context.xml similarity index 100% rename from res/menu/folder_context.xml rename to k9mail/src/main/res/menu/folder_context.xml diff --git a/res/menu/folder_list_option.xml b/k9mail/src/main/res/menu/folder_list_option.xml similarity index 100% rename from res/menu/folder_list_option.xml rename to k9mail/src/main/res/menu/folder_list_option.xml diff --git a/res/menu/folder_select_option.xml b/k9mail/src/main/res/menu/folder_select_option.xml similarity index 100% rename from res/menu/folder_select_option.xml rename to k9mail/src/main/res/menu/folder_select_option.xml diff --git a/res/menu/manage_identities_context.xml b/k9mail/src/main/res/menu/manage_identities_context.xml similarity index 100% rename from res/menu/manage_identities_context.xml rename to k9mail/src/main/res/menu/manage_identities_context.xml diff --git a/res/menu/manage_identities_option.xml b/k9mail/src/main/res/menu/manage_identities_option.xml similarity index 100% rename from res/menu/manage_identities_option.xml rename to k9mail/src/main/res/menu/manage_identities_option.xml diff --git a/res/menu/message_compose_option.xml b/k9mail/src/main/res/menu/message_compose_option.xml similarity index 100% rename from res/menu/message_compose_option.xml rename to k9mail/src/main/res/menu/message_compose_option.xml diff --git a/res/menu/message_list_context.xml b/k9mail/src/main/res/menu/message_list_context.xml similarity index 100% rename from res/menu/message_list_context.xml rename to k9mail/src/main/res/menu/message_list_context.xml diff --git a/res/menu/message_list_item_context.xml b/k9mail/src/main/res/menu/message_list_item_context.xml similarity index 100% rename from res/menu/message_list_item_context.xml rename to k9mail/src/main/res/menu/message_list_item_context.xml diff --git a/res/menu/message_list_option.xml b/k9mail/src/main/res/menu/message_list_option.xml similarity index 100% rename from res/menu/message_list_option.xml rename to k9mail/src/main/res/menu/message_list_option.xml diff --git a/res/values-ca/strings.xml b/k9mail/src/main/res/values-ca/strings.xml similarity index 100% rename from res/values-ca/strings.xml rename to k9mail/src/main/res/values-ca/strings.xml diff --git a/res/values-cs/strings.xml b/k9mail/src/main/res/values-cs/strings.xml similarity index 100% rename from res/values-cs/strings.xml rename to k9mail/src/main/res/values-cs/strings.xml diff --git a/res/values-da/strings.xml b/k9mail/src/main/res/values-da/strings.xml similarity index 100% rename from res/values-da/strings.xml rename to k9mail/src/main/res/values-da/strings.xml diff --git a/res/values-de/strings.xml b/k9mail/src/main/res/values-de/strings.xml similarity index 100% rename from res/values-de/strings.xml rename to k9mail/src/main/res/values-de/strings.xml diff --git a/res/values-el/strings.xml b/k9mail/src/main/res/values-el/strings.xml similarity index 100% rename from res/values-el/strings.xml rename to k9mail/src/main/res/values-el/strings.xml diff --git a/res/values-es/strings.xml b/k9mail/src/main/res/values-es/strings.xml similarity index 100% rename from res/values-es/strings.xml rename to k9mail/src/main/res/values-es/strings.xml diff --git a/res/values-et/strings.xml b/k9mail/src/main/res/values-et/strings.xml similarity index 100% rename from res/values-et/strings.xml rename to k9mail/src/main/res/values-et/strings.xml diff --git a/res/values-eu/strings.xml b/k9mail/src/main/res/values-eu/strings.xml similarity index 100% rename from res/values-eu/strings.xml rename to k9mail/src/main/res/values-eu/strings.xml diff --git a/res/values-fi/strings.xml b/k9mail/src/main/res/values-fi/strings.xml similarity index 100% rename from res/values-fi/strings.xml rename to k9mail/src/main/res/values-fi/strings.xml diff --git a/res/values-fr/strings.xml b/k9mail/src/main/res/values-fr/strings.xml similarity index 100% rename from res/values-fr/strings.xml rename to k9mail/src/main/res/values-fr/strings.xml diff --git a/res/values-gl-rES/strings.xml b/k9mail/src/main/res/values-gl-rES/strings.xml similarity index 100% rename from res/values-gl-rES/strings.xml rename to k9mail/src/main/res/values-gl-rES/strings.xml diff --git a/res/values-gl/strings.xml b/k9mail/src/main/res/values-gl/strings.xml similarity index 100% rename from res/values-gl/strings.xml rename to k9mail/src/main/res/values-gl/strings.xml diff --git a/res/values-hr/strings.xml b/k9mail/src/main/res/values-hr/strings.xml similarity index 100% rename from res/values-hr/strings.xml rename to k9mail/src/main/res/values-hr/strings.xml diff --git a/res/values-hu/strings.xml b/k9mail/src/main/res/values-hu/strings.xml similarity index 100% rename from res/values-hu/strings.xml rename to k9mail/src/main/res/values-hu/strings.xml diff --git a/res/values-it/strings.xml b/k9mail/src/main/res/values-it/strings.xml similarity index 100% rename from res/values-it/strings.xml rename to k9mail/src/main/res/values-it/strings.xml diff --git a/res/values-iw/strings.xml b/k9mail/src/main/res/values-iw/strings.xml similarity index 100% rename from res/values-iw/strings.xml rename to k9mail/src/main/res/values-iw/strings.xml diff --git a/res/values-ja/strings.xml b/k9mail/src/main/res/values-ja/strings.xml similarity index 100% rename from res/values-ja/strings.xml rename to k9mail/src/main/res/values-ja/strings.xml diff --git a/res/values-ko/strings.xml b/k9mail/src/main/res/values-ko/strings.xml similarity index 100% rename from res/values-ko/strings.xml rename to k9mail/src/main/res/values-ko/strings.xml diff --git a/res/values-land/styles.xml b/k9mail/src/main/res/values-land/styles.xml similarity index 100% rename from res/values-land/styles.xml rename to k9mail/src/main/res/values-land/styles.xml diff --git a/res/values-lt/strings.xml b/k9mail/src/main/res/values-lt/strings.xml similarity index 100% rename from res/values-lt/strings.xml rename to k9mail/src/main/res/values-lt/strings.xml diff --git a/res/values-lv/strings.xml b/k9mail/src/main/res/values-lv/strings.xml similarity index 100% rename from res/values-lv/strings.xml rename to k9mail/src/main/res/values-lv/strings.xml diff --git a/res/values-nb/strings.xml b/k9mail/src/main/res/values-nb/strings.xml similarity index 100% rename from res/values-nb/strings.xml rename to k9mail/src/main/res/values-nb/strings.xml diff --git a/res/values-nl/strings.xml b/k9mail/src/main/res/values-nl/strings.xml similarity index 100% rename from res/values-nl/strings.xml rename to k9mail/src/main/res/values-nl/strings.xml diff --git a/res/values-pl/strings.xml b/k9mail/src/main/res/values-pl/strings.xml similarity index 100% rename from res/values-pl/strings.xml rename to k9mail/src/main/res/values-pl/strings.xml diff --git a/res/values-pt-rBR/strings.xml b/k9mail/src/main/res/values-pt-rBR/strings.xml similarity index 100% rename from res/values-pt-rBR/strings.xml rename to k9mail/src/main/res/values-pt-rBR/strings.xml diff --git a/res/values-ru/strings.xml b/k9mail/src/main/res/values-ru/strings.xml similarity index 100% rename from res/values-ru/strings.xml rename to k9mail/src/main/res/values-ru/strings.xml diff --git a/res/values-sk/strings.xml b/k9mail/src/main/res/values-sk/strings.xml similarity index 100% rename from res/values-sk/strings.xml rename to k9mail/src/main/res/values-sk/strings.xml diff --git a/res/values-sv/strings.xml b/k9mail/src/main/res/values-sv/strings.xml similarity index 100% rename from res/values-sv/strings.xml rename to k9mail/src/main/res/values-sv/strings.xml diff --git a/res/values-sw600dp-land/styles.xml b/k9mail/src/main/res/values-sw600dp-land/styles.xml similarity index 100% rename from res/values-sw600dp-land/styles.xml rename to k9mail/src/main/res/values-sw600dp-land/styles.xml diff --git a/res/values-sw600dp-port/styles.xml b/k9mail/src/main/res/values-sw600dp-port/styles.xml similarity index 100% rename from res/values-sw600dp-port/styles.xml rename to k9mail/src/main/res/values-sw600dp-port/styles.xml diff --git a/res/values-tr/strings.xml b/k9mail/src/main/res/values-tr/strings.xml similarity index 100% rename from res/values-tr/strings.xml rename to k9mail/src/main/res/values-tr/strings.xml diff --git a/res/values-uk/strings.xml b/k9mail/src/main/res/values-uk/strings.xml similarity index 100% rename from res/values-uk/strings.xml rename to k9mail/src/main/res/values-uk/strings.xml diff --git a/res/values-v21/styles.xml b/k9mail/src/main/res/values-v21/styles.xml similarity index 100% rename from res/values-v21/styles.xml rename to k9mail/src/main/res/values-v21/styles.xml diff --git a/res/values-zh-rCN/strings.xml b/k9mail/src/main/res/values-zh-rCN/strings.xml similarity index 100% rename from res/values-zh-rCN/strings.xml rename to k9mail/src/main/res/values-zh-rCN/strings.xml diff --git a/res/values-zh-rTW/plugin_strings.xml b/k9mail/src/main/res/values-zh-rTW/plugin_strings.xml similarity index 100% rename from res/values-zh-rTW/plugin_strings.xml rename to k9mail/src/main/res/values-zh-rTW/plugin_strings.xml diff --git a/res/values-zh-rTW/strings.xml b/k9mail/src/main/res/values-zh-rTW/strings.xml similarity index 100% rename from res/values-zh-rTW/strings.xml rename to k9mail/src/main/res/values-zh-rTW/strings.xml diff --git a/res/values/arrays.xml b/k9mail/src/main/res/values/arrays.xml similarity index 100% rename from res/values/arrays.xml rename to k9mail/src/main/res/values/arrays.xml diff --git a/res/values/attrs.xml b/k9mail/src/main/res/values/attrs.xml similarity index 100% rename from res/values/attrs.xml rename to k9mail/src/main/res/values/attrs.xml diff --git a/res/values/colors.xml b/k9mail/src/main/res/values/colors.xml similarity index 100% rename from res/values/colors.xml rename to k9mail/src/main/res/values/colors.xml diff --git a/res/values/constants.xml b/k9mail/src/main/res/values/constants.xml similarity index 100% rename from res/values/constants.xml rename to k9mail/src/main/res/values/constants.xml diff --git a/res/values/dimensions.xml b/k9mail/src/main/res/values/dimensions.xml similarity index 100% rename from res/values/dimensions.xml rename to k9mail/src/main/res/values/dimensions.xml diff --git a/res/values/ids.xml b/k9mail/src/main/res/values/ids.xml similarity index 100% rename from res/values/ids.xml rename to k9mail/src/main/res/values/ids.xml diff --git a/res/values/strings.xml b/k9mail/src/main/res/values/strings.xml similarity index 100% rename from res/values/strings.xml rename to k9mail/src/main/res/values/strings.xml diff --git a/res/values/styles.xml b/k9mail/src/main/res/values/styles.xml similarity index 100% rename from res/values/styles.xml rename to k9mail/src/main/res/values/styles.xml diff --git a/res/values/themes.xml b/k9mail/src/main/res/values/themes.xml similarity index 100% rename from res/values/themes.xml rename to k9mail/src/main/res/values/themes.xml diff --git a/res/xml-ja/changelog.xml b/k9mail/src/main/res/xml-ja/changelog.xml similarity index 100% rename from res/xml-ja/changelog.xml rename to k9mail/src/main/res/xml-ja/changelog.xml diff --git a/res/xml/account_settings_preferences.xml b/k9mail/src/main/res/xml/account_settings_preferences.xml similarity index 100% rename from res/xml/account_settings_preferences.xml rename to k9mail/src/main/res/xml/account_settings_preferences.xml diff --git a/res/xml/changelog_master.xml b/k9mail/src/main/res/xml/changelog_master.xml similarity index 100% rename from res/xml/changelog_master.xml rename to k9mail/src/main/res/xml/changelog_master.xml diff --git a/res/xml/folder_settings_preferences.xml b/k9mail/src/main/res/xml/folder_settings_preferences.xml similarity index 100% rename from res/xml/folder_settings_preferences.xml rename to k9mail/src/main/res/xml/folder_settings_preferences.xml diff --git a/res/xml/font_preferences.xml b/k9mail/src/main/res/xml/font_preferences.xml similarity index 100% rename from res/xml/font_preferences.xml rename to k9mail/src/main/res/xml/font_preferences.xml diff --git a/res/xml/global_preferences.xml b/k9mail/src/main/res/xml/global_preferences.xml similarity index 100% rename from res/xml/global_preferences.xml rename to k9mail/src/main/res/xml/global_preferences.xml diff --git a/res/xml/providers.xml b/k9mail/src/main/res/xml/providers.xml similarity index 100% rename from res/xml/providers.xml rename to k9mail/src/main/res/xml/providers.xml diff --git a/res/xml/searchable.xml b/k9mail/src/main/res/xml/searchable.xml similarity index 100% rename from res/xml/searchable.xml rename to k9mail/src/main/res/xml/searchable.xml diff --git a/res/xml/unread_widget_info.xml b/k9mail/src/main/res/xml/unread_widget_info.xml similarity index 100% rename from res/xml/unread_widget_info.xml rename to k9mail/src/main/res/xml/unread_widget_info.xml diff --git a/settings.gradle b/settings.gradle index 05e675797..b2d35b11d 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,3 +1,4 @@ +include ':k9mail' include ':plugins:Android-PullToRefresh:library' include ':plugins:ckChangeLog:library' include ':plugins:HoloColorPicker' diff --git a/tests-on-jvm/build.gradle b/tests-on-jvm/build.gradle index ff62c4d92..563a283bd 100644 --- a/tests-on-jvm/build.gradle +++ b/tests-on-jvm/build.gradle @@ -8,7 +8,7 @@ apply plugin: 'checkstyle' apply plugin: 'jacoco' dependencies { - testCompile project(':') + testCompile project(':k9mail') testCompile 'junit:junit:4.12' } @@ -20,10 +20,10 @@ sourceSets { } test { - compileClasspath += files(rootProject.compileDebugJava.destinationDir) - compileClasspath += rootProject.compileDebugJava.classpath - runtimeClasspath += files(rootProject.compileDebugJava.destinationDir) - runtimeClasspath += rootProject.compileDebugJava.classpath + compileClasspath += files(project(':k9mail').compileDebugJava.destinationDir) + compileClasspath += project(':k9mail').compileDebugJava.classpath + runtimeClasspath += files(project(':k9mail').compileDebugJava.destinationDir) + runtimeClasspath += project(':k9mail').compileDebugJava.classpath java { srcDirs = ['src'] } @@ -45,4 +45,4 @@ findbugs { check.dependsOn 'checkstyleTest' check.dependsOn 'findbugsTest' -compileTestJava.dependsOn ':compileDebugJava' +compileTestJava.dependsOn ':k9mail:compileDebugJava' diff --git a/tests/proguard.cfg b/tests/proguard.cfg deleted file mode 100644 index b1cdf17b5..000000000 --- a/tests/proguard.cfg +++ /dev/null @@ -1,40 +0,0 @@ --optimizationpasses 5 --dontusemixedcaseclassnames --dontskipnonpubliclibraryclasses --dontpreverify --verbose --optimizations !code/simplification/arithmetic,!field/*,!class/merging/* - --keep public class * extends android.app.Activity --keep public class * extends android.app.Application --keep public class * extends android.app.Service --keep public class * extends android.content.BroadcastReceiver --keep public class * extends android.content.ContentProvider --keep public class * extends android.app.backup.BackupAgentHelper --keep public class * extends android.preference.Preference --keep public class com.android.vending.licensing.ILicensingService - --keepclasseswithmembernames class * { - native ; -} - --keepclasseswithmembers class * { - public (android.content.Context, android.util.AttributeSet); -} - --keepclasseswithmembers class * { - public (android.content.Context, android.util.AttributeSet, int); -} - --keepclassmembers class * extends android.app.Activity { - public void *(android.view.View); -} - --keepclassmembers enum * { - public static **[] values(); - public static ** valueOf(java.lang.String); -} - --keep class * implements android.os.Parcelable { - public static final android.os.Parcelable$Creator *; -}