diff --git a/.project b/.project
deleted file mode 100644
index 6a8c2199f..000000000
--- a/.project
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>k9mail</name>
-	<comment></comment>
-	<projects>
-		<project>k9mail-Android-PullToRefresh</project>
-		<project>k9mail-ckChangeLog</project>
-		<project>k9mail-HoloColorPicker</project>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/.tx/config b/.tx/config
index d3c91c2e5..18227211c 100644
--- a/.tx/config
+++ b/.tx/config
@@ -3,6 +3,6 @@ host = https://www.transifex.com
 lang_map = af_ZA: af-rZA, am_ET: am-rET, ar_AE: ar-rAE, ar_BH: ar-rBH, ar_DZ: ar-rDZ, ar_EG: ar-rEG, ar_IQ: ar-rIQ, ar_JO: ar-rJO, ar_KW: ar-rKW, ar_LB: ar-rLB, ar_LY: ar-rLY, ar_MA: ar-rMA, ar_OM: ar-rOM, ar_QA: ar-rQA, ar_SA: ar-rSA, ar_SY: ar-rSY, ar_TN: ar-rTN, ar_YE: ar-rYE, arn_CL: arn-rCL, as_IN: as-rIN, az_AZ: az-rAZ, ba_RU: ba-rRU, be_BY: be-rBY, bg_BG: bg-rBG, bn_BD: bn-rBD, bn_IN: bn-rIN, bo_CN: bo-rCN, br_FR: br-rFR, bs_BA: bs-rBA, ca_ES: ca-rES, co_FR: co-rFR, cs_CZ: cs-rCZ, cy_GB: cy-rGB, da_DK: da-rDK, de_AT: de-rAT, de_CH: de-rCH, de_DE: de-rDE, de_LI: de-rLI, de_LU: de-rLU, dsb_DE: dsb-rDE, dv_MV: dv-rMV, el_GR: el-rGR, en_AU: en-rAU, en_BZ: en-rBZ, en_CA: en-rCA, en_GB: en-rGB, en_IE: en-rIE, en_IN: en-rIN, en_JM: en-rJM, en_MY: en-rMY, en_NZ: en-rNZ, en_PH: en-rPH, en_SG: en-rSG, en_TT: en-rTT, en_US: en-rUS, en_ZA: en-rZA, en_ZW: en-rZW, es_AR: es-rAR, es_BO: es-rBO, es_CL: es-rCL, es_CO: es-rCO, es_CR: es-rCR, es_DO: es-rDO, es_EC: es-rEC, es_ES: es-rES, es_GT: es-rGT, es_HN: es-rHN, es_MX: es-rMX, es_NI: es-rNI, es_PA: es-rPA, es_PE: es-rPE, es_PR: es-rPR, es_PY: es-rPY, es_SV: es-rSV, es_US: es-rUS, es_UY: es-rUY, es_VE: es-rVE, et_EE: et-rEE, eu_ES: eu-rES, fa_IR: fa-rIR, fi_FI: fi-rFI, fil_PH: fil-rPH, fo_FO: fo-rFO, fr_BE: fr-rBE, fr_CA: fr-rCA, fr_CH: fr-rCH, fr_FR: fr-rFR, fr_LU: fr-rLU, fr_MC: fr-rMC, fy_NL: fy-rNL, ga_IE: ga-rIE, gd_GB: gd-rGB, gl_ES: gl-rES, gsw_FR: gsw-rFR, gu_IN: gu-rIN, ha_NG: ha-rNG, hi_IN: hi-rIN, hr_BA: hr-rBA, hr_HR: hr-rHR, hsb_DE: hsb-rDE, hu_HU: hu-rHU, hy_AM: hy-rAM, id_ID: id-rID, ig_NG: ig-rNG, ii_CN: ii-rCN, is_IS: is-rIS, it_CH: it-rCH, it_IT: it-rIT, iu_CA: iu-rCA, ja_JP: ja-rJP, ka_GE: ka-rGE, kk_KZ: kk-rKZ, kl_GL: kl-rGL, km_KH: km-rKH, kn_IN: kn-rIN, ko_KR: ko-rKR, kok_IN: kok-rIN, ky_KG: ky-rKG, lb_LU: lb-rLU, lo_LA: lo-rLA, lt_LT: lt-rLT, lv_LV: lv-rLV, mi_NZ: mi-rNZ, mk_MK: mk-rMK, ml_IN: ml-rIN, mn_CN: mn-rCN, mn_MN: mn-rMN, moh_CA: moh-rCA, mr_IN: mr-rIN, ms_BN: ms-rBN, ms_MY: ms-rMY, mt_MT: mt-rMT, nb_NO: nb-rNO, ne_NP: ne-rNP, nl_BE: nl-rBE, nl_NL: nl-rNL, nn_NO: nn-rNO, nso_ZA: nso-rZA, oc_FR: oc-rFR, or_IN: or-rIN, pa_IN: pa-rIN, pl_PL: pl-rPL, prs_AF: prs-rAF, ps_AF: ps-rAF, pt_BR: pt-rBR, pt_PT: pt-rPT, qut_GT: qut-rGT, quz_BO: quz-rBO, quz_EC: quz-rEC, quz_PE: quz-rPE, rm_CH: rm-rCH, ro_RO: ro-rRO, ru_RU: ru-rRU, rw_RW: rw-rRW, sa_IN: sa-rIN, sah_RU: sah-rRU, se_FI: se-rFI, se_NO: se-rNO, se_SE: se-rSE, si_LK: si-rLK, sk_SK: sk-rSK, sl_SI: sl-rSI, sma_NO: sma-rNO, sma_SE: sma-rSE, smj_NO: smj-rNO, smj_SE: smj-rSE, smn_FI: smn-rFI, sms_FI: sms-rFI, sq_AL: sq-rAL, sr_BA: sr-rBA, sr_CS: sr-rCS, sr_ME: sr-rME, sr_RS: sr-rRS, sv_FI: sv-rFI, sv_SE: sv-rSE, sw_KE: sw-rKE, syr_SY: syr-rSY, ta_IN: ta-rIN, te_IN: te-rIN, tg_TJ: tg-rTJ, th_TH: th-rTH, tk_TM: tk-rTM, tn_ZA: tn-rZA, tr_TR: tr-rTR, tt_RU: tt-rRU, tzm_DZ: tzm-rDZ, ug_CN: ug-rCN, uk_UA: uk-rUA, ur_PK: ur-rPK, uz_UZ: uz-rUZ, vi_VN: vi-rVN, wo_SN: wo-rSN, xh_ZA: xh-rZA, yo_NG: yo-rNG, zh_CN: zh-rCN, zh_HK: zh-rHK, zh_MO: zh-rMO, zh_SG: zh-rSG, zh_TW: zh-rTW, zu_ZA: zu-rZA, no_NO: no-rNO, he_IL: iw-rIL, he: iw
 
 [k9mail.strings]
-file_filter = res/values-<lang>/strings.xml
-source_file = res/values/strings.xml
+file_filter = k9mail/src/main/res/values-<lang>/strings.xml
+source_file = k9mail/src/main/res/values/strings.xml
 source_lang = en
diff --git a/Android.mk b/Android.mk
deleted file mode 100644
index 5d232f0fb..000000000
--- a/Android.mk
+++ /dev/null
@@ -1,47 +0,0 @@
-LOCAL_PATH:= $(call my-dir)
-include $(CLEAR_VARS)
-
-LOCAL_STATIC_JAVA_LIBRARIES += libcore
-LOCAL_STATIC_JAVA_LIBRARIES += libdom
-LOCAL_STATIC_JAVA_LIBRARIES += libio
-LOCAL_STATIC_JAVA_LIBRARIES += libjutf
-LOCAL_STATIC_JAVA_LIBRARIES += libjzlib
-LOCAL_STATIC_JAVA_LIBRARIES += libhtmlcleaner
-LOCAL_STATIC_JAVA_LIBRARIES += android-support-v4
-
-LOCAL_MODULE_TAGS := eng
-
-LOCAL_SRC_FILES := $(call all-java-files-under, src)
-LOCAL_SRC_FILES += $(call all-java-files-under, plugins/Android-PullToRefresh/library/src)
-LOCAL_SRC_FILES += $(call all-java-files-under, plugins/ckChangeLog/library/src)
-LOCAL_SRC_FILES += $(call all-java-files-under, plugins/HoloColorPicker/src)
-
-res_dir := res plugins/Android-PullToRefresh/library/res plugins/ckChangeLog/library/res plugins/HoloColorPicker/res
-LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dir))
-
-LOCAL_SDK_VERSION := current
-
-LOCAL_PACKAGE_NAME := Email
-
-LOCAL_AAPT_INCLUDE_ALL_RESOURCES := true
-LOCAL_AAPT_FLAGS := --auto-add-overlay
-LOCAL_AAPT_FLAGS += --extra-packages de.cketti.library.changelog
-LOCAL_AAPT_FLAGS += --extra-packages android.support.v4.app
-LOCAL_AAPT_FLAGS += --extra-packages com.handmark.pulltorefresh.library
-LOCAL_AAPT_FLAGS += --extra-packages com.larswerkman.colorpicker
-
-LOCAL_PROGUARD_FLAG_FILES := proguard.cfg
-
-include $(BUILD_PACKAGE)
-##################################################
-include $(CLEAR_VARS)
-
-LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES += libcore:libs/apache-mime4j-core-0.7.2.jar
-LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES += libdom:libs/apache-mime4j-dom-0.7.2.jar
-LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES += libio:libs/commons-io-2.0.1.jar
-LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES += libjutf:libs/jutf7-1.0.1-SNAPSHOT.jar
-LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES += libjzlib:libs/jzlib-1.0.7.jar
-LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES += libhtmlcleaner:libs/htmlcleaner-2.2.jar
-
-include $(BUILD_MULTI_PREBUILT)
-
diff --git a/MODULE_LICENSE_APACHE2 b/MODULE_LICENSE_APACHE2
deleted file mode 100644
index e69de29bb..000000000
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/build.xml b/build.xml
deleted file mode 100644
index 5f39d7e80..000000000
--- a/build.xml
+++ /dev/null
@@ -1,472 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="K9" default="help">
-
-    <!-- The local.properties file is created and updated by the 'android' tool.
-         It contains the path to the SDK. It should *NOT* be checked into
-         Version Control Systems. -->
-    <property file="local.properties" />
-
-    <!-- The ant.properties file can be created by you. It is only edited by the
-         'android' tool to add properties to it.
-         This is the place to change some Ant specific build properties.
-         Here are some properties you may want to change/update:
-
-         source.dir
-             The name of the source directory. Default is 'src'.
-         out.dir
-             The name of the output directory. Default is 'bin'.
-
-         For other overridable properties, look at the beginning of the rules
-         files in the SDK, at tools/ant/build.xml
-
-         Properties related to the SDK location or the project target should
-         be updated using the 'android' tool with the 'update' action.
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems.
-
-         -->
-    <property file="ant.properties" />
-
-    <!-- The project.properties file is created and updated by the 'android'
-         tool, as well as ADT.
-
-         This contains project specific properties such as project target, and library
-         dependencies. Lower level build properties are stored in ant.properties
-         (or in .classpath for Eclipse projects).
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems. -->
-    <loadproperties srcFile="project.properties" />
-
-    <!-- quick check on sdk.dir -->
-    <fail
-            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through an env var"
-            unless="sdk.dir"
-    />
-
-    <!--
-        Import per project custom build rules if present at the root of the project.
-        This is the place to put custom intermediary targets such as:
-            -pre-build
-            -pre-compile
-            -post-compile (This is typically used for code obfuscation.
-                           Compiled code location: ${out.classes.absolute.dir}
-                           If this is not done in place, override ${out.dex.input.absolute.dir})
-            -post-package
-            -post-build
-            -pre-clean
-    -->
-    <import file="custom_rules.xml" optional="true" />
-
-    <!-- Import the actual build file.
-
-         To customize existing targets, there are two options:
-         - Customize only one target:
-             - copy/paste the target into this file, *before* the
-               <import> task.
-             - customize it to your needs.
-         - Customize the whole content of build.xml
-             - copy/paste the content of the rules files (minus the top node)
-               into this file, replacing the <import> task.
-             - customize to your needs.
-
-         ***********************
-         ****** IMPORTANT ******
-         ***********************
-         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
-         in order to avoid having your file be overridden by tools such as "android update project"
-    -->
-    <!-- version-tag: custom -->
-    <import file="${sdk.dir}/tools/ant/build.xml" />
-
-    <!-- K9 CUSTOM STUFF -->
-
-    <!-- out folders for a parent project if this project is an instrumentation project -->
-    <property name="rclib" value="${out.dir}/K9RemoteControl.jar" />
-    <property name="rcdir" value="com/fsck/k9/remotecontrol/**" />
-
-    <property name="changelog-path-src" value="res/xml/changelog_master.xml" />
-
-    <!-- Name given to the remote git repository -->
-    <property name="origin" value="origin" />
-
-    <!-- Name used for the temporary gh-pages branch in the local git repo -->
-    <property name="gh-pages-tmp" value="gh-pages-tmp" />
-
-    <condition property="android.executable" value="android.bat">
-        <os family="windows" />
-    </condition>
-    <property name="android.executable" value="android" />
-
-    <target name="-get-version" depends="-get-version-name">
-        <echo>Building version number ${current-version-name}</echo>
-    </target>
-
-    <target name="-get-version-name">
-        <xpath input="AndroidManifest.xml" expression="/manifest/@android:versionName" output="current-version-name" />
-    </target>
-
-    <target name="-get-version-code">
-        <xpath input="AndroidManifest.xml" expression="/manifest/@android:versionCode" output="current-version-code" />
-    </target>
-
-    <target name="-get-version-from-git">
-        <exec executable="git" failonerror="true" outputproperty="current-version-name" errorproperty="current-version-error">
-            <arg line="describe --tags" />
-        </exec>
-        <echo>Building version number ${current-version-name}</echo>
-    </target>
-
-    <target name="-auto-incr-version">
-        <regex property="major" input="${current-version-name}" regexp="(\d+)\.\d+" select="\1" />
-        <regex property="minor" input="${current-version-name}" regexp="\d+\.(\d+)" select="\1" />
-        <math result="minor" operand1="${minor}" operation="+" operand2="1" datatype="int"/>
-        <if.contrib>
-            <length string="${minor}" when="eq" length="1" />
-            <then>
-                <var name="minor" value="00${minor}" />
-            </then>
-            <elseif>
-                <length string="${minor}" when="eq" length="2" />
-                <then>
-                    <var name="minor" value="0${minor}" />
-                </then>
-            </elseif>
-        </if.contrib>
-        <regex property="version-name" input="${major}." regexp="(\d+.)" replace="\1${minor}" />
-    </target>
-
-    <target name="-pre-bump-check" depends="-get-version-name,-auto-incr-version">
-        <xpath
-            input="${changelog-path-src}"
-            expression="/changelog/release[@version='${version-name}']/@version"
-            output="changelog-test" />
-
-        <if.contrib>
-            <equals arg1="${changelog-test}" arg2="${version-name}" />
-            <else>
-                <fail>No changelog for ${version-name}.</fail>
-            </else>
-        </if.contrib>
-
-        <exec executable="git" failonerror="true" outputproperty="git-status" errorproperty="git-status-error">
-            <arg line="status -s ${changelog-path-src}" />
-        </exec>
-        <if.contrib>
-            <equals arg1="${git-status}" arg2="" />
-            <else>
-                <fail>Uncomitted changelog edits.</fail>
-            </else>
-        </if.contrib>
-
-        <!-- Check for a clean index, because it will be reset in -update-gh-pages-branch -->
-        <exec executable="git" failonerror="true">
-            <arg line="diff-index --cached --quiet HEAD" />
-        </exec>
-
-        <!-- Check that the temporary gh-pages branch doesn't exist in the local git repo -->
-        <exec executable="git" failonerror="true" outputproperty="gh-pages-tmp-status" errorproperty="gh-pages-tmp-status-error">
-            <arg line="branch --list ${gh-pages-tmp}" />
-        </exec>
-        <if.contrib>
-            <equals arg1="${gh-pages-tmp-status}" arg2="" />
-            <else>
-                <fail>Temporary branch ${gh-pages-tmp} exists (but should not).</fail>
-            </else>
-        </if.contrib>
-
-        <!-- Check that there is no existing git tag for the new version -->
-        <exec executable="git" failonerror="true" outputproperty="git-tag-status" errorproperty="git-tag-status-error">
-            <arg line="tag --list ${version-name}" />
-        </exec>
-        <if.contrib>
-            <equals arg1="${git-tag-status}" arg2="" />
-            <else>
-                <fail>A git tag for version ${version-name} already exists (but should not).</fail>
-            </else>
-        </if.contrib>
-
-        <!-- Assure that we have the latest gh-pages branch -->
-        <exec executable="git" failonerror="true">
-            <arg line="fetch ${origin} +refs/heads/gh-pages:refs/remotes/${origin}/gh-pages" />
-        </exec>
-
-    </target>
-
-    <target name="-set-version" depends="-get-version-name,-get-version-code">
-        <!-- pass -Dversion-name=4.200 to define the version instead of auto-incrementing it -->
-        <if.contrib>
-            <isset property="version-name" />
-            <else>
-                <runtarget target="-auto-incr-version" />
-            </else>
-        </if.contrib>
-
-        <echo>Setting version to ${version-name}</echo>
-
-        <replace file="AndroidManifest.xml"
-            token="android:versionName=&quot;${current-version-name}&quot;"
-            value="android:versionName=&quot;${version-name}&quot;" summary="true"
-        />
-
-        <math result="new-version-code" operand1="${current-version-code}" operation="+" operand2="1" datatype="int"/>
-        <replace file="AndroidManifest.xml"
-            token="android:versionCode=&quot;${current-version-code}&quot;"
-            value="android:versionCode=&quot;${new-version-code}&quot;" summary="true"
-        />
-    </target>
-
-    <!-- rules -->
-    <target name="bump-version" depends="-pre-bump-check,-set-version,-commit-version,-update-gh-pages-branch,-push-version">
-        <echo>Bumped K-9 to ${version-name}</echo>
-    </target>
-
-    <target name="-commit-version">
-        <exec executable="git" failonerror="true">
-            <arg line="commit -m'Bumped manifest to ${version-name}' AndroidManifest.xml" />
-        </exec>
-        <exec executable="git" failonerror="true">
-            <arg line="tag ${version-name}" />
-        </exec>
-    </target>
-
-    <!-- Copy the changelog to the gh-pages branch. -->
-    <target name="-update-gh-pages-branch">
-
-        <!-- Create a temporary branch for use in updating the remote gh-pages branch.  -->
-        <exec executable="git" failonerror="true">
-            <arg line="branch ${gh-pages-tmp} ${origin}/gh-pages" />
-        </exec>
-
-        <!-- Save HEAD before switching branches -->
-        <exec executable="git" failonerror="true" outputproperty="git-branch-ref" errorproperty="git-branch-ref-error">
-            <arg line="symbolic-ref HEAD" />
-        </exec>
-
-        <!-- Switch to the temporary branch with no checkout.  The working tree remains untouched. -->
-        <exec executable="git" failonerror="true">
-            <arg line="symbolic-ref HEAD refs/heads/${gh-pages-tmp}" />
-        </exec>
-
-        <!--  Clean up the index on the temporary branch -->
-        <exec executable="git" failonerror="true">
-            <arg line="reset -q" />
-        </exec>
-
-        <!-- Retrieve tree info for the changelog file to be copied from HEAD -->
-        <exec executable="git" failonerror="true" outputproperty="git-ls-tree" errorproperty="git-ls-tree-error">
-            <arg line="ls-tree ${git-branch-ref} ${changelog-path-src}" />
-        </exec>
-
-        <!-- Update the path and name of the changelog for where it will be stored in the temp. branch -->
-        <regex property="changelog-path-dst" input="${git-branch-ref}" regexp=".*/([^/]+$)" select="changelog_\1_branch.xml" />
-        <regex property="git-index-info" input="${git-ls-tree}" regexp="(.*\t).*" select="\1${changelog-path-dst}" />
-
-        <!-- Add the changelog to the index -->
-        <exec executable="git" failonerror="true" inputstring="${git-index-info}">
-            <arg line="update-index --index-info" />
-        </exec>
-
-        <!-- Commit the changelog -->
-        <exec executable="git" failonerror="true">
-            <arg line="commit -m'Update changelog for version ${version-name}'" />
-        </exec>
-
-        <!-- Switch back to HEAD, again without touching the (original) working tree -->
-        <exec executable="git" failonerror="true">
-            <arg line="symbolic-ref HEAD ${git-branch-ref}" />
-        </exec>
-
-        <!-- Clean up the index for HEAD -->
-        <exec executable="git" failonerror="true">
-            <arg line="reset -q" />
-        </exec>
-    </target>
-
-    <target name="-push-version">
-        <exec executable="git" failonerror="true">
-            <arg line="push ${origin} HEAD ${gh-pages-tmp}:gh-pages tag ${version-name}" />
-        </exec>
-
-        <!--  Delete the temporary branch -->
-        <exec executable="git" failonerror="true">
-            <arg line="branch -D ${gh-pages-tmp}" />
-        </exec>
-    </target>
-
-    <!-- Create the output directories if they don't exist yet. -->
-    <target name="rclib" depends="-compile">
-        <echo>Creating library ${rclib} for remote control applications</echo>
-        <jar destfile="${rclib}" basedir="${out.classes.dir}" includes="${rcdir}" />
-    </target>
-
-    <target name="upload" depends="clean,-get-version,release">
-        <echo>Uploading to Google Code using Google::Code::Upload</echo>
-        <move file="${out.final.file}" tofile="bin/k9-${current-version-name}-release.apk" />
-        <property name="gcode-project" value="k9mail" />
-        <exec executable="googlecode_upload.pl" failonerror="true">
-            <arg value="--summary" />
-            <arg value="${ant.project.name} ${current-version-name}" />
-            <arg value="--project" />
-            <arg value="${gcode-project}" />
-            <arg value="--user" />
-            <arg value="${gcode-user}" />
-            <arg value="--pass" />
-            <arg value="${gcode-pass}" />
-            <arg value="--labels" />
-            <arg value="Type-Installer" />
-            <arg value="bin/k9-${current-version-name}-release.apk" />
-        </exec>
-    </target>
-
-    <target name="astyle">
-        <exec executable="astyle" failonerror="true">
-            <arg line="--style=java --indent=spaces=4 --indent-switches --max-instatement-indent=40 --add-brackets --convert-tabs --unpad-paren --pad-header --pad-oper --suffix=none --recursive 'src/com/fsck/k9/*.java' 'tests/src/com/fsck/k9/*.java'" />
-        </exec>
-    </target>
-
-    <target name="help" depends="android_rules.help">
-        <!-- displays starts at col 13
-              |13                                                              80| -->
-        <echo>Additional targets:</echo>
-     <!--echo>   bump-version: ant -Dversion-name=3.123</echo>
-        <echo>              Bumps the project version to 3.123,tags and commits it.</echo>
-        <echo>              If version-name is not given, it will auto-increment.</echo>
-        <echo>   upload:    Uploads a new release to google code.</echo-->
-        <echo>   rclib:     Creates library for remote control applications.</echo>
-        <echo>   astyle:    Make K-9's source look like it's supposed to.</echo>
-        <echo>   eclipse:   Apply template Eclipse settings.</echo>
-        <echo>   javadoc:   Javadoc output to javadoc/. ANDROID_HOME environment</echo>
-        <echo>              variable must be set (i.e. /opt/android-sdk-linux/).</echo>
-        <echo>   lint-xml:  Lint output lint-results.xml.</echo>
-        <echo>   lint-html: Lint output to lint-results.html.</echo>
-        <echo>   monkey:    Runs monkey on the running emulator. Change the</echo>
-        <echo>              defaults -Dmonkey.seed=NUM and -Dmonkey.count=NUM</echo>
-        <echo>              from 0 and 200, respectively.</echo>
-    </target>
-
-    <target name="eclipse" description="Apply template Eclipse settings">
-        <copy todir=".settings">
-            <fileset dir="tools/eclipse-settings" />
-        </copy>
-    </target>
-
-    <target name="monkey">
-        <xpath input="AndroidManifest.xml" expression="/manifest/@package" output="manifest.package" />
-        <property name="monkey.count" value="200" />
-        <property name="monkey.seed" value="0" /><!-- largest == 9223372036854775807 == 2**63 - 1 -->
-        <exec executable="${adb}" output="monkey.txt" failonerror="true">
-            <arg line="${adb.device.arg}" />
-            <arg value="-e" />
-            <arg value="shell" />
-            <arg value="monkey" />
-            <arg value="-p" />
-            <arg value="${manifest.package}" />
-            <arg value="-v" />
-            <arg value="-v" />
-            <arg value="-s" />
-            <arg value="${monkey.seed}" />
-            <arg value="${monkey.count}" />
-        </exec>
-    </target>
-
-    <target name="reg" depends="-get-version-code">
-        <regex property="branch" input="${env.GIT_BRANCH}" regexp="(?:.*/)?(.+)" select="\1" global="true"/>
-        <regex property="commit" input="${env.GIT_COMMIT}" regexp="([\da-fA-F]{10})" select="\1" global="true"/>
-        <math result="version-code" operand1="${current-version-code}" operation="+" operand2="1" datatype="int"/>
-        <echo message="branch = ${branch} ${commit} ${current-version-code} ${version-code}" />
-    </target>
-
-    <!-- this is for CloudBees. see tests/build.xml -->
-    <target name="-artifactd" depends="-set-debug-files, -artifact" />
-    <target name="-artifacti" depends="-set-instrumented-mode, -artifact" />
-    <target name="-artifact">
-        <regex property="branch" input="${env.GIT_BRANCH}" regexp="(?:.*/)?(.+)" select="\1" global="true" />
-        <regex property="commit" input="${env.GIT_COMMIT}" regexp="([\da-fA-F]{10})" select="\1" />
-
-        <copy file="${out.final.file}"
-              tofile="${out.dir}/${ant.project.name}-${branch}-${env.BUILD_ID}-${commit}-${env.BUILD_NUMBER}.apk"
-              verbose="on"
-        />
-    </target>
-
-    <target name="-pre-clean" description="Removes testing output and javadoc">
-        <delete file="monkey.txt" verbose="${verbose}" />
-        <delete file="lint-results.xml" verbose="${verbose}" />
-        <delete file="lint-results.html" verbose="${verbose}" />
-        <delete dir="lint-results_files" verbose="${verbose}" />
-        <delete dir="${javadoc-dir}" verbose="${verbose}" />
-    </target>
-
-    <target name="-update-ptr">
-        <if.contrib>
-            <resourceexists>
-                <file file="plugins/Android-PullToRefresh/library/build.xml" />
-            </resourceexists>
-            <else>
-                <echo message="android update lib-project -p plugins/Android-PullToRefresh/library/" />
-                <exec executable="${sdk.dir}/tools/${android.executable}" failonerror="true">
-                    <arg line="update lib-project -p plugins/Android-PullToRefresh/library/" />
-                </exec>
-            </else>
-        </if.contrib>
-    </target>
-
-	<target name="-update-cl">
-        <if.contrib>
-            <resourceexists>
-                <file file="plugins/ckChangeLog/library/build.xml" />
-            </resourceexists>
-            <else>
-                <echo message="android update lib-project -p plugins/ckChangeLog/library/" />
-                <exec executable="${sdk.dir}/tools/${android.executable}" failonerror="true">
-                    <arg line="update lib-project -p plugins/ckChangeLog/library/" />
-                </exec>
-            </else>
-        </if.contrib>
-    </target>
-
-	<target name="-update-hcp">
-        <if.contrib>
-            <resourceexists>
-                <file file="plugins/HoloColorPicker/build.xml" />
-            </resourceexists>
-            <else>
-                <echo message="android update lib-project -p plugins/HoloColorPicker/" />
-                <exec executable="${sdk.dir}/tools/${android.executable}" failonerror="true">
-                    <arg line="update lib-project -p plugins/HoloColorPicker/" />
-                </exec>
-            </else>
-        </if.contrib>
-    </target>
-
-    <target name="-update-opa">
-        <if.contrib>
-            <resourceexists>
-                <file file="plugins/openpgp-api-library/build.xml" />
-            </resourceexists>
-            <else>
-                <echo message="android update lib-project -p plugins/openpgp-api-library/" />
-                <exec executable="${sdk.dir}/tools/${android.executable}" failonerror="true">
-                    <arg line="update lib-project -p plugins/openpgp-api-library/" />
-                </exec>
-            </else>
-        </if.contrib>
-    </target>
-
-    <target name="init" depends="-update-ptr, -update-cl, -update-hcp, -update-opa"
-            description="Initialize environment for building" />
-
-    <!-- overrides default "debug" target" -->
-    <!-- Builds debug output package -->
-    <target name="debug" depends="init, -set-debug-files, -do-debug, -post-build"
-            description="Builds the application and signs it with a debug key.">
-    </target>
-
-    <!-- common to both build.xml and tests/build.xml -->
-    <import file="build_common.xml" />
-
-    <!-- END K-9 CUSTOM STUFF -->
-
-</project>
diff --git a/build_common.xml b/build_common.xml
deleted file mode 100644
index 4b668eae4..000000000
--- a/build_common.xml
+++ /dev/null
@@ -1,96 +0,0 @@
-<project name="common">
-    <!-- This file contains scriptdefs, properties, targets, etc that are common
-         to both build.xml and tests/build.xml. It also loads ant-contrib, where
-         each desired task needs to be defined below as both ant-contrib and
-         Android's anttasks.jar define different 'if' tasks. -->
-
-
-    <!-- ANT-CONTRIB -->
-
-    <!-- jar file from where the tasks are loaded -->
-    <if>
-        <condition>
-            <isset property="tested.project.dir" />
-        </condition>
-        <then>
-            <path id="antcontrib">
-                <pathelement path="${tested.project.dir}/tools/ant-contrib.jar" />
-            </path>
-        </then>
-        <else>
-            <path id="antcontrib">
-                <pathelement path="tools/ant-contrib.jar" />
-            </path>
-        </else>
-    </if>
-
-    <!-- ant-contrib tasks -->
-    <!-- this is normally named propertyregex -->
-    <taskdef name="regex"
-            classname="net.sf.antcontrib.property.RegexTask"
-            classpathref="antcontrib" />
-    <taskdef name="math"
-            classname="net.sf.antcontrib.math.MathTask"
-            classpathref="antcontrib" />
-    <taskdef name="runtarget"
-            classname="net.sf.antcontrib.logic.RunTargetTask"
-            classpathref="antcontrib" />
-    <taskdef name="var"
-            classname="net.sf.antcontrib.property.Variable"
-            classpathref="antcontrib" />
-    <!-- renamed to not conflict with android -->
-    <taskdef name="if.contrib"
-            classname="net.sf.antcontrib.logic.IfTask"
-            classpathref="antcontrib" />
-
-
-    <!-- SCRIPTDEFS -->
-
-
-    <!-- PROPERTIES -->
-
-    <!-- allow environment variables to be accessable by prepending "env." -->
-    <property environment="env" />
-
-    <!-- javadoc folder relative to ${basedir} -->
-    <property name="javadoc-dir" location="javadoc" />
-
-    <!-- path to lint -->
-    <property name="lint" location="${android.tools.dir}/lint${bat}" />
-
-
-    <!-- TARGETS -->
-
-    <!-- create javadoc in ${javadoc-dir} -->
-    <target name="javadoc" description="build javadoc">
-        <mkdir dir="${javadoc-dir}"/>
-        <javadoc
-            destdir="${javadoc-dir}"
-            doctitle="K-9 Mail"
-            verbose="on"
-            use="true"
-            classpath="${env.ANDROID_HOME}/platforms/${target}/android.jar"
-            sourcepath="gen;src"
-            linkoffline="http://d.android.com/reference ${env.ANDROID_HOME}/docs/reference/"
-        />
-    </target>
-
-    <!-- create lint-results.xml -->
-    <target name="lint-xml">
-        <exec executable="${lint}" failonerror="true">
-            <arg value="--xml" />
-            <arg value="lint-results.xml" />
-            <arg path="${basedir}" />
-        </exec>
-    </target>
-
-    <!-- create lint-results.html and lint-results_files/ -->
-    <target name="lint-html">
-        <exec executable="${lint}" failonerror="true">
-            <arg value="--html" />
-            <arg value="lint-results.html" />
-            <arg path="${basedir}" />
-        </exec>
-    </target>
-
-</project>
diff --git a/compile-only-libs/android-support-v4-src.zip b/compile-only-libs/android-support-v4-src.zip
deleted file mode 100644
index bc819938d..000000000
Binary files a/compile-only-libs/android-support-v4-src.zip and /dev/null differ
diff --git a/compile-only-libs/android-support-v4.jar b/compile-only-libs/android-support-v4.jar
deleted file mode 100644
index 428bdbc02..000000000
Binary files a/compile-only-libs/android-support-v4.jar and /dev/null differ
diff --git a/compile-only-libs/junit-4.8.2.jar b/compile-only-libs/junit-4.8.2.jar
deleted file mode 100644
index 5b4bb849a..000000000
Binary files a/compile-only-libs/junit-4.8.2.jar and /dev/null differ
diff --git a/compile-only-libs/mockito-all-1.8.5.jar b/compile-only-libs/mockito-all-1.8.5.jar
deleted file mode 100644
index 4b0395ed8..000000000
Binary files a/compile-only-libs/mockito-all-1.8.5.jar and /dev/null differ
diff --git a/lint.xml b/config/lint/lint.xml
similarity index 70%
rename from lint.xml
rename to config/lint/lint.xml
index 489cd7093..ad613c633 100644
--- a/lint.xml
+++ b/config/lint/lint.xml
@@ -4,14 +4,14 @@
 
     <!-- Transifex and Lint disagree on what quantities are necessary -->
     <issue id="UnusedQuantity" severity="warning">
-        <ignore path="res/values-*/strings.xml" />
+        <ignore path="src/main/res/values-*/strings.xml" />
     </issue>
     <issue id="MissingQuantity" severity="warning">
-        <ignore path="res/values-*/strings.xml" />
+        <ignore path="src/main/res/values-*/strings.xml" />
     </issue>
 
     <!-- Remove this when we have separate Transifex resources for plugins -->
     <issue id="ExtraTranslation" severity="error">
-        <ignore path="res/values-zh-rTW/plugin_strings.xml" />
+        <ignore path="src/main/res/values-zh-rTW/plugin_strings.xml" />
     </issue>
 </lint>
diff --git a/docs/NOTES b/docs/NOTES
deleted file mode 100644
index e69de29bb..000000000
diff --git a/docs/TESTS b/docs/TESTS
deleted file mode 100644
index b89e882a1..000000000
--- a/docs/TESTS
+++ /dev/null
@@ -1,23 +0,0 @@
-Some simple functional tests
---
-
-Compose a message
-    Attach an image to the message
-    Save the message as a draft
-    Reopen the draft
-    * Is the attachment still there?
-    Send the message.
-    * Does the received message have the correct attachment?
-
-Check delete functionality on POP and IMAP account.
-
-Check delete functionality on IMAP with no network connection.
-
-Check save draft functionality on POP and IMAP account.
-
-Check save draft functionality on IMAP with no network connection.
-
-Check sent message functionality on POP and IMAP account.
-
-Check sent functionality on IMAP with no network connection.
-    * When the network is brought back does the sent message get uploaded?
diff --git a/docs/TODO b/docs/TODO
deleted file mode 100644
index d504dd434..000000000
--- a/docs/TODO
+++ /dev/null
@@ -1,27 +0,0 @@
-Currently
---
-Need to add NOOP checking to Pop3Store and ImapStore on cached connections.
-
-
-
-
-
-
-
-
-
-
-
-
-In the future
---
-Move attachments to files, instead of storing as blobs in the database. There are tons of ways
-we can make the app perform better with this small change. Primarily, we can do everything
-pertaining to large attachments as streams instead of as large loads into byte arrays.
-
-Get rid of the LocalStore's attachment to Store altogether. Local storage is too complex and
-specific to performance to be bound to the Store API. It needs to be flexible with plenty of helper
-functions to make best use of memory and resources.
-
-Make better use of the abstractions for Body, Part and BodyPart. Proper use of these abstractions
-can completely remove the need for the special headers.
diff --git a/gradle/plugins/checkstyle-android.gradle b/gradle/plugins/checkstyle-android.gradle
new file mode 100644
index 000000000..7eb193767
--- /dev/null
+++ b/gradle/plugins/checkstyle-android.gradle
@@ -0,0 +1,12 @@
+apply plugin: 'checkstyle'
+
+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()
+}
diff --git a/gradle/plugins/findbugs-android.gradle b/gradle/plugins/findbugs-android.gradle
new file mode 100644
index 000000000..ee83f1808
--- /dev/null
+++ b/gradle/plugins/findbugs-android.gradle
@@ -0,0 +1,14 @@
+apply plugin: 'findbugs'
+
+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")
+}
diff --git a/k9mail-library/build.gradle b/k9mail-library/build.gradle
new file mode 100644
index 000000000..27fcd488e
--- /dev/null
+++ b/k9mail-library/build.gradle
@@ -0,0 +1,43 @@
+apply plugin: 'com.android.library'
+apply from: '../gradle/plugins/checkstyle-android.gradle'
+apply from: '../gradle/plugins/findbugs-android.gradle'
+
+repositories {
+    jcenter()
+}
+
+dependencies {
+    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'
+}
+
+android {
+    compileSdkVersion 21
+    buildToolsVersion '21.1.2'
+
+    defaultConfig {
+        minSdkVersion 15
+        targetSdkVersion 17
+    }
+
+    lintOptions {
+        abortOnError false
+        lintConfig file("$rootProject.projectDir/config/lint/lint.xml")
+    }
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_6
+        targetCompatibility JavaVersion.VERSION_1_6
+    }
+
+    packagingOptions {
+        exclude 'META-INF/DEPENDENCIES'
+        exclude 'META-INF/LICENSE'
+        exclude 'META-INF/LICENSE.txt'
+        exclude 'META-INF/NOTICE'
+        exclude 'META-INF/NOTICE.txt'
+    }
+}
diff --git a/k9mail-library/src/main/AndroidManifest.xml b/k9mail-library/src/main/AndroidManifest.xml
new file mode 100644
index 000000000..147efd7d7
--- /dev/null
+++ b/k9mail-library/src/main/AndroidManifest.xml
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest package="com.fsck.k9.mail" />
diff --git a/src/com/fsck/k9/mail/Address.java b/k9mail-library/src/main/java/com/fsck/k9/mail/Address.java
similarity index 100%
rename from src/com/fsck/k9/mail/Address.java
rename to k9mail-library/src/main/java/com/fsck/k9/mail/Address.java
diff --git a/src/com/fsck/k9/mail/AuthType.java b/k9mail-library/src/main/java/com/fsck/k9/mail/AuthType.java
similarity index 100%
rename from src/com/fsck/k9/mail/AuthType.java
rename to k9mail-library/src/main/java/com/fsck/k9/mail/AuthType.java
diff --git a/src/com/fsck/k9/mail/Authentication.java b/k9mail-library/src/main/java/com/fsck/k9/mail/Authentication.java
similarity index 100%
rename from src/com/fsck/k9/mail/Authentication.java
rename to k9mail-library/src/main/java/com/fsck/k9/mail/Authentication.java
diff --git a/src/com/fsck/k9/mail/AuthenticationFailedException.java b/k9mail-library/src/main/java/com/fsck/k9/mail/AuthenticationFailedException.java
similarity index 100%
rename from src/com/fsck/k9/mail/AuthenticationFailedException.java
rename to k9mail-library/src/main/java/com/fsck/k9/mail/AuthenticationFailedException.java
diff --git a/src/com/fsck/k9/mail/Body.java b/k9mail-library/src/main/java/com/fsck/k9/mail/Body.java
similarity index 100%
rename from src/com/fsck/k9/mail/Body.java
rename to k9mail-library/src/main/java/com/fsck/k9/mail/Body.java
diff --git a/src/com/fsck/k9/mail/BodyPart.java b/k9mail-library/src/main/java/com/fsck/k9/mail/BodyPart.java
similarity index 100%
rename from src/com/fsck/k9/mail/BodyPart.java
rename to k9mail-library/src/main/java/com/fsck/k9/mail/BodyPart.java
diff --git a/src/com/fsck/k9/mail/CertificateChainException.java b/k9mail-library/src/main/java/com/fsck/k9/mail/CertificateChainException.java
similarity index 100%
rename from src/com/fsck/k9/mail/CertificateChainException.java
rename to k9mail-library/src/main/java/com/fsck/k9/mail/CertificateChainException.java
diff --git a/src/com/fsck/k9/mail/CertificateValidationException.java b/k9mail-library/src/main/java/com/fsck/k9/mail/CertificateValidationException.java
similarity index 100%
rename from src/com/fsck/k9/mail/CertificateValidationException.java
rename to k9mail-library/src/main/java/com/fsck/k9/mail/CertificateValidationException.java
diff --git a/src/com/fsck/k9/mail/CompositeBody.java b/k9mail-library/src/main/java/com/fsck/k9/mail/CompositeBody.java
similarity index 100%
rename from src/com/fsck/k9/mail/CompositeBody.java
rename to k9mail-library/src/main/java/com/fsck/k9/mail/CompositeBody.java
diff --git a/src/com/fsck/k9/mail/ConnectionSecurity.java b/k9mail-library/src/main/java/com/fsck/k9/mail/ConnectionSecurity.java
similarity index 100%
rename from src/com/fsck/k9/mail/ConnectionSecurity.java
rename to k9mail-library/src/main/java/com/fsck/k9/mail/ConnectionSecurity.java
diff --git a/src/com/fsck/k9/mail/FetchProfile.java b/k9mail-library/src/main/java/com/fsck/k9/mail/FetchProfile.java
similarity index 100%
rename from src/com/fsck/k9/mail/FetchProfile.java
rename to k9mail-library/src/main/java/com/fsck/k9/mail/FetchProfile.java
diff --git a/src/com/fsck/k9/mail/Flag.java b/k9mail-library/src/main/java/com/fsck/k9/mail/Flag.java
similarity index 100%
rename from src/com/fsck/k9/mail/Flag.java
rename to k9mail-library/src/main/java/com/fsck/k9/mail/Flag.java
diff --git a/src/com/fsck/k9/mail/Folder.java b/k9mail-library/src/main/java/com/fsck/k9/mail/Folder.java
similarity index 100%
rename from src/com/fsck/k9/mail/Folder.java
rename to k9mail-library/src/main/java/com/fsck/k9/mail/Folder.java
diff --git a/src/com/fsck/k9/mail/K9MailLib.java b/k9mail-library/src/main/java/com/fsck/k9/mail/K9MailLib.java
similarity index 100%
rename from src/com/fsck/k9/mail/K9MailLib.java
rename to k9mail-library/src/main/java/com/fsck/k9/mail/K9MailLib.java
diff --git a/src/com/fsck/k9/mail/Message.java b/k9mail-library/src/main/java/com/fsck/k9/mail/Message.java
similarity index 100%
rename from src/com/fsck/k9/mail/Message.java
rename to k9mail-library/src/main/java/com/fsck/k9/mail/Message.java
diff --git a/src/com/fsck/k9/mail/MessageRetrievalListener.java b/k9mail-library/src/main/java/com/fsck/k9/mail/MessageRetrievalListener.java
similarity index 100%
rename from src/com/fsck/k9/mail/MessageRetrievalListener.java
rename to k9mail-library/src/main/java/com/fsck/k9/mail/MessageRetrievalListener.java
diff --git a/src/com/fsck/k9/mail/MessagingException.java b/k9mail-library/src/main/java/com/fsck/k9/mail/MessagingException.java
similarity index 100%
rename from src/com/fsck/k9/mail/MessagingException.java
rename to k9mail-library/src/main/java/com/fsck/k9/mail/MessagingException.java
diff --git a/src/com/fsck/k9/mail/Multipart.java b/k9mail-library/src/main/java/com/fsck/k9/mail/Multipart.java
similarity index 100%
rename from src/com/fsck/k9/mail/Multipart.java
rename to k9mail-library/src/main/java/com/fsck/k9/mail/Multipart.java
diff --git a/src/com/fsck/k9/mail/Part.java b/k9mail-library/src/main/java/com/fsck/k9/mail/Part.java
similarity index 100%
rename from src/com/fsck/k9/mail/Part.java
rename to k9mail-library/src/main/java/com/fsck/k9/mail/Part.java
diff --git a/src/com/fsck/k9/mail/PushReceiver.java b/k9mail-library/src/main/java/com/fsck/k9/mail/PushReceiver.java
similarity index 89%
rename from src/com/fsck/k9/mail/PushReceiver.java
rename to k9mail-library/src/main/java/com/fsck/k9/mail/PushReceiver.java
index 2657c4669..60ad4fe96 100644
--- a/src/com/fsck/k9/mail/PushReceiver.java
+++ b/k9mail-library/src/main/java/com/fsck/k9/mail/PushReceiver.java
@@ -2,7 +2,7 @@ package com.fsck.k9.mail;
 
 import java.util.List;
 
-import com.fsck.k9.helper.power.TracingPowerManager.TracingWakeLock;
+import com.fsck.k9.mail.power.TracingPowerManager.TracingWakeLock;
 
 import android.content.Context;
 
diff --git a/src/com/fsck/k9/mail/Pusher.java b/k9mail-library/src/main/java/com/fsck/k9/mail/Pusher.java
similarity index 100%
rename from src/com/fsck/k9/mail/Pusher.java
rename to k9mail-library/src/main/java/com/fsck/k9/mail/Pusher.java
diff --git a/src/com/fsck/k9/mail/ServerSettings.java b/k9mail-library/src/main/java/com/fsck/k9/mail/ServerSettings.java
similarity index 100%
rename from src/com/fsck/k9/mail/ServerSettings.java
rename to k9mail-library/src/main/java/com/fsck/k9/mail/ServerSettings.java
diff --git a/src/com/fsck/k9/mail/Store.java b/k9mail-library/src/main/java/com/fsck/k9/mail/Store.java
similarity index 100%
rename from src/com/fsck/k9/mail/Store.java
rename to k9mail-library/src/main/java/com/fsck/k9/mail/Store.java
diff --git a/src/com/fsck/k9/mail/Transport.java b/k9mail-library/src/main/java/com/fsck/k9/mail/Transport.java
similarity index 100%
rename from src/com/fsck/k9/mail/Transport.java
rename to k9mail-library/src/main/java/com/fsck/k9/mail/Transport.java
diff --git a/src/com/fsck/k9/mail/filter/Base64.java b/k9mail-library/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-library/src/main/java/com/fsck/k9/mail/filter/Base64.java
diff --git a/src/com/fsck/k9/mail/filter/Base64OutputStream.java b/k9mail-library/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-library/src/main/java/com/fsck/k9/mail/filter/Base64OutputStream.java
diff --git a/src/com/fsck/k9/mail/filter/CountingOutputStream.java b/k9mail-library/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-library/src/main/java/com/fsck/k9/mail/filter/CountingOutputStream.java
diff --git a/src/com/fsck/k9/mail/filter/EOLConvertingOutputStream.java b/k9mail-library/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-library/src/main/java/com/fsck/k9/mail/filter/EOLConvertingOutputStream.java
diff --git a/src/com/fsck/k9/mail/filter/FixedLengthInputStream.java b/k9mail-library/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-library/src/main/java/com/fsck/k9/mail/filter/FixedLengthInputStream.java
diff --git a/src/com/fsck/k9/mail/filter/Hex.java b/k9mail-library/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-library/src/main/java/com/fsck/k9/mail/filter/Hex.java
diff --git a/src/com/fsck/k9/mail/filter/LineWrapOutputStream.java b/k9mail-library/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-library/src/main/java/com/fsck/k9/mail/filter/LineWrapOutputStream.java
diff --git a/src/com/fsck/k9/mail/filter/PeekableInputStream.java b/k9mail-library/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-library/src/main/java/com/fsck/k9/mail/filter/PeekableInputStream.java
diff --git a/src/com/fsck/k9/mail/filter/SmtpDataStuffing.java b/k9mail-library/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-library/src/main/java/com/fsck/k9/mail/filter/SmtpDataStuffing.java
diff --git a/src/com/fsck/k9/mail/internet/BinaryTempFileBody.java b/k9mail-library/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-library/src/main/java/com/fsck/k9/mail/internet/BinaryTempFileBody.java
diff --git a/src/com/fsck/k9/mail/internet/BinaryTempFileMessageBody.java b/k9mail-library/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-library/src/main/java/com/fsck/k9/mail/internet/BinaryTempFileMessageBody.java
diff --git a/src/com/fsck/k9/mail/internet/CharsetSupport.java b/k9mail-library/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-library/src/main/java/com/fsck/k9/mail/internet/CharsetSupport.java
diff --git a/src/com/fsck/k9/mail/internet/DecoderUtil.java b/k9mail-library/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-library/src/main/java/com/fsck/k9/mail/internet/DecoderUtil.java
diff --git a/src/com/fsck/k9/mail/internet/EncoderUtil.java b/k9mail-library/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-library/src/main/java/com/fsck/k9/mail/internet/EncoderUtil.java
diff --git a/src/com/fsck/k9/mail/internet/Iso2022JpToShiftJisInputStream.java b/k9mail-library/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-library/src/main/java/com/fsck/k9/mail/internet/Iso2022JpToShiftJisInputStream.java
diff --git a/src/com/fsck/k9/mail/internet/JisSupport.java b/k9mail-library/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-library/src/main/java/com/fsck/k9/mail/internet/JisSupport.java
diff --git a/src/com/fsck/k9/mail/internet/MessageExtractor.java b/k9mail-library/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-library/src/main/java/com/fsck/k9/mail/internet/MessageExtractor.java
diff --git a/src/com/fsck/k9/mail/internet/MimeBodyPart.java b/k9mail-library/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-library/src/main/java/com/fsck/k9/mail/internet/MimeBodyPart.java
diff --git a/src/com/fsck/k9/mail/internet/MimeHeader.java b/k9mail-library/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-library/src/main/java/com/fsck/k9/mail/internet/MimeHeader.java
diff --git a/src/com/fsck/k9/mail/internet/MimeMessage.java b/k9mail-library/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-library/src/main/java/com/fsck/k9/mail/internet/MimeMessage.java
diff --git a/src/com/fsck/k9/mail/internet/MimeMultipart.java b/k9mail-library/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-library/src/main/java/com/fsck/k9/mail/internet/MimeMultipart.java
diff --git a/src/com/fsck/k9/mail/internet/MimeUtility.java b/k9mail-library/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-library/src/main/java/com/fsck/k9/mail/internet/MimeUtility.java
diff --git a/src/com/fsck/k9/mail/internet/TextBody.java b/k9mail-library/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-library/src/main/java/com/fsck/k9/mail/internet/TextBody.java
diff --git a/src/com/fsck/k9/mail/internet/Viewable.java b/k9mail-library/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-library/src/main/java/com/fsck/k9/mail/internet/Viewable.java
diff --git a/src/com/fsck/k9/helper/power/TracingPowerManager.java b/k9mail-library/src/main/java/com/fsck/k9/mail/power/TracingPowerManager.java
similarity index 74%
rename from src/com/fsck/k9/helper/power/TracingPowerManager.java
rename to k9mail-library/src/main/java/com/fsck/k9/mail/power/TracingPowerManager.java
index 471768f17..bd55fd5b0 100644
--- a/src/com/fsck/k9/helper/power/TracingPowerManager.java
+++ b/k9mail-library/src/main/java/com/fsck/k9/mail/power/TracingPowerManager.java
@@ -1,15 +1,19 @@
-package com.fsck.k9.helper.power;
+package com.fsck.k9.mail.power;
 
 import java.util.Timer;
 import java.util.TimerTask;
 import java.util.concurrent.atomic.AtomicInteger;
 
-import com.fsck.k9.K9;
+import com.fsck.k9.mail.K9MailLib;
+
 import android.content.Context;
 import android.os.PowerManager;
 import android.os.PowerManager.WakeLock;
 import android.util.Log;
 
+import static com.fsck.k9.mail.K9MailLib.LOG_TAG;
+
+
 public class TracingPowerManager {
     private final static boolean TRACE = false;
     public static AtomicInteger wakeLockId = new AtomicInteger(0);
@@ -20,8 +24,8 @@ public class TracingPowerManager {
     public static synchronized TracingPowerManager getPowerManager(Context context) {
         Context appContext = context.getApplicationContext();
         if (tracingPowerManager == null) {
-            if (K9.DEBUG) {
-                Log.v(K9.LOG_TAG, "Creating TracingPowerManager");
+            if (K9MailLib.isDebug()) {
+                Log.v(LOG_TAG, "Creating TracingPowerManager");
             }
             tracingPowerManager = new TracingPowerManager(appContext);
         }
@@ -50,16 +54,16 @@ public class TracingPowerManager {
             tag = ntag;
             wakeLock = pm.newWakeLock(flags, tag);
             id = wakeLockId.getAndIncrement();
-            if (K9.DEBUG) {
-                Log.v(K9.LOG_TAG, "TracingWakeLock for tag " + tag + " / id " + id + ": Create");
+            if (K9MailLib.isDebug()) {
+                Log.v(LOG_TAG, "TracingWakeLock for tag " + tag + " / id " + id + ": Create");
             }
         }
         public void acquire(long timeout) {
             synchronized (wakeLock) {
                 wakeLock.acquire(timeout);
             }
-            if (K9.DEBUG) {
-                Log.v(K9.LOG_TAG, "TracingWakeLock for tag " + tag + " / id " + id + " for " + timeout + " ms: acquired");
+            if (K9MailLib.isDebug()) {
+                Log.v(LOG_TAG, "TracingWakeLock for tag " + tag + " / id " + id + " for " + timeout + " ms: acquired");
             }
             raiseNotification();
             if (startTime == null) {
@@ -72,8 +76,8 @@ public class TracingPowerManager {
                 wakeLock.acquire();
             }
             raiseNotification();
-            if (K9.DEBUG) {
-                Log.w(K9.LOG_TAG, "TracingWakeLock for tag " + tag + " / id " + id + ": acquired with no timeout.  K-9 Mail should not do this");
+            if (K9MailLib.isDebug()) {
+                Log.w(LOG_TAG, "TracingWakeLock for tag " + tag + " / id " + id + ": acquired with no timeout.  K-9 Mail should not do this");
             }
             if (startTime == null) {
                 startTime = System.currentTimeMillis();
@@ -88,12 +92,12 @@ public class TracingPowerManager {
         public void release() {
             if (startTime != null) {
                 Long endTime = System.currentTimeMillis();
-                if (K9.DEBUG) {
-                    Log.v(K9.LOG_TAG, "TracingWakeLock for tag " + tag + " / id " + id + ": releasing after " + (endTime - startTime) + " ms, timeout = " + timeout + " ms");
+                if (K9MailLib.isDebug()) {
+                    Log.v(LOG_TAG, "TracingWakeLock for tag " + tag + " / id " + id + ": releasing after " + (endTime - startTime) + " ms, timeout = " + timeout + " ms");
                 }
             } else {
-                if (K9.DEBUG) {
-                    Log.v(K9.LOG_TAG, "TracingWakeLock for tag " + tag + " / id " + id + ", timeout = " + timeout + " ms: releasing");
+                if (K9MailLib.isDebug()) {
+                    Log.v(LOG_TAG, "TracingWakeLock for tag " + tag + " / id " + id + ", timeout = " + timeout + " ms: releasing");
                 }
             }
             cancelNotification();
@@ -123,11 +127,11 @@ public class TracingPowerManager {
                         public void run() {
                             if (startTime != null) {
                                 Long endTime = System.currentTimeMillis();
-                                Log.i(K9.LOG_TAG, "TracingWakeLock for tag " + tag + " / id " + id + ": has been active for "
+                                Log.i(LOG_TAG, "TracingWakeLock for tag " + tag + " / id " + id + ": has been active for "
                                       + (endTime - startTime) + " ms, timeout = " + timeout + " ms");
 
                             } else {
-                                Log.i(K9.LOG_TAG, "TracingWakeLock for tag " + tag + " / id " + id + ": still active, timeout = " + timeout + " ms");
+                                Log.i(LOG_TAG, "TracingWakeLock for tag " + tag + " / id " + id + ": still active, timeout = " + timeout + " ms");
                             }
                         }
 
diff --git a/src/com/fsck/k9/mail/ssl/DefaultTrustedSocketFactory.java b/k9mail-library/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-library/src/main/java/com/fsck/k9/mail/ssl/DefaultTrustedSocketFactory.java
diff --git a/src/com/fsck/k9/mail/ssl/KeyChainKeyManager.java b/k9mail-library/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-library/src/main/java/com/fsck/k9/mail/ssl/KeyChainKeyManager.java
diff --git a/src/com/fsck/k9/mail/ssl/LocalKeyStore.java b/k9mail-library/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-library/src/main/java/com/fsck/k9/mail/ssl/LocalKeyStore.java
diff --git a/src/com/fsck/k9/mail/ssl/TrustManagerFactory.java b/k9mail-library/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-library/src/main/java/com/fsck/k9/mail/ssl/TrustManagerFactory.java
diff --git a/src/com/fsck/k9/mail/ssl/TrustedSocketFactory.java b/k9mail-library/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-library/src/main/java/com/fsck/k9/mail/ssl/TrustedSocketFactory.java
diff --git a/src/com/fsck/k9/mail/store/RemoteStore.java b/k9mail-library/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-library/src/main/java/com/fsck/k9/mail/store/RemoteStore.java
diff --git a/src/com/fsck/k9/mail/store/StoreConfig.java b/k9mail-library/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-library/src/main/java/com/fsck/k9/mail/store/StoreConfig.java
diff --git a/src/com/fsck/k9/mail/store/imap/ImapCommands.java b/k9mail-library/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-library/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-library/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-library/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-library/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-library/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-library/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-library/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-library/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-library/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-library/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-library/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-library/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-library/src/main/java/com/fsck/k9/mail/store/imap/ImapResponseParser.java
diff --git a/src/com/fsck/k9/mail/store/imap/ImapSettings.java b/k9mail-library/src/main/java/com/fsck/k9/mail/store/imap/ImapSettings.java
similarity index 100%
rename from src/com/fsck/k9/mail/store/imap/ImapSettings.java
rename to k9mail-library/src/main/java/com/fsck/k9/mail/store/imap/ImapSettings.java
diff --git a/src/com/fsck/k9/mail/store/imap/ImapStore.java b/k9mail-library/src/main/java/com/fsck/k9/mail/store/imap/ImapStore.java
similarity index 99%
rename from src/com/fsck/k9/mail/store/imap/ImapStore.java
rename to k9mail-library/src/main/java/com/fsck/k9/mail/store/imap/ImapStore.java
index 9600cb053..f0959b4b0 100644
--- a/src/com/fsck/k9/mail/store/imap/ImapStore.java
+++ b/k9mail-library/src/main/java/com/fsck/k9/mail/store/imap/ImapStore.java
@@ -37,8 +37,8 @@ import android.os.PowerManager;
 import android.text.TextUtils;
 import android.util.Log;
 
-import com.fsck.k9.helper.power.TracingPowerManager;
-import com.fsck.k9.helper.power.TracingPowerManager.TracingWakeLock;
+import com.fsck.k9.mail.power.TracingPowerManager;
+import com.fsck.k9.mail.power.TracingPowerManager.TracingWakeLock;
 import com.fsck.k9.mail.AuthType;
 import com.fsck.k9.mail.Body;
 import com.fsck.k9.mail.ConnectionSecurity;
diff --git a/src/com/fsck/k9/mail/store/imap/ImapUtility.java b/k9mail-library/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-library/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-library/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-library/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-library/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-library/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-library/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-library/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-library/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-library/src/main/java/com/fsck/k9/mail/store/webdav/WebDavStore.java
diff --git a/src/com/fsck/k9/mail/transport/SmtpTransport.java b/k9mail-library/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-library/src/main/java/com/fsck/k9/mail/transport/SmtpTransport.java
diff --git a/src/com/fsck/k9/mail/transport/WebDavTransport.java b/k9mail-library/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-library/src/main/java/com/fsck/k9/mail/transport/WebDavTransport.java
diff --git a/k9mail/build.gradle b/k9mail/build.gradle
new file mode 100644
index 000000000..8fc4877a1
--- /dev/null
+++ b/k9mail/build.gradle
@@ -0,0 +1,78 @@
+apply plugin: 'android-sdk-manager'
+apply plugin: 'com.android.application'
+apply from: '../gradle/plugins/checkstyle-android.gradle'
+apply from: '../gradle/plugins/findbugs-android.gradle'
+
+repositories {
+    jcenter()
+}
+
+dependencies {
+    compile project(':k9mail-library')
+    compile project(':plugins:Android-PullToRefresh:library')
+    compile project(':plugins:HoloColorPicker')
+    compile project(':plugins:openpgp-api-library')
+    compile 'commons-io:commons-io:2.0.1'
+    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'
+    compile 'de.cketti.library.changelog:ckchangelog:1.2.1'
+}
+
+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
+        lintConfig file("$rootProject.projectDir/config/lint/lint.xml")
+    }
+
+    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
+    }
+}
+
+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 99%
rename from src/com/fsck/k9/activity/FolderList.java
rename to k9mail/src/main/java/com/fsck/k9/activity/FolderList.java
index 254b87745..ee135b532 100644
--- a/src/com/fsck/k9/activity/FolderList.java
+++ b/k9mail/src/main/java/com/fsck/k9/activity/FolderList.java
@@ -51,8 +51,8 @@ import com.fsck.k9.activity.setup.Prefs;
 import com.fsck.k9.controller.MessagingController;
 import com.fsck.k9.controller.MessagingListener;
 import com.fsck.k9.helper.SizeFormatter;
-import com.fsck.k9.helper.power.TracingPowerManager;
-import com.fsck.k9.helper.power.TracingPowerManager.TracingWakeLock;
+import com.fsck.k9.mail.power.TracingPowerManager;
+import com.fsck.k9.mail.power.TracingPowerManager.TracingWakeLock;
 import com.fsck.k9.mail.Folder;
 import com.fsck.k9.mail.Message;
 import com.fsck.k9.mailstore.LocalFolder;
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 99%
rename from src/com/fsck/k9/controller/MessagingController.java
rename to k9mail/src/main/java/com/fsck/k9/controller/MessagingController.java
index 3fb19d02b..a0d4ef2e3 100644
--- a/src/com/fsck/k9/controller/MessagingController.java
+++ b/k9mail/src/main/java/com/fsck/k9/controller/MessagingController.java
@@ -61,8 +61,8 @@ import com.fsck.k9.activity.setup.AccountSetupOutgoing;
 import com.fsck.k9.cache.EmailProviderCache;
 import com.fsck.k9.helper.Contacts;
 import com.fsck.k9.helper.MessageHelper;
-import com.fsck.k9.helper.power.TracingPowerManager;
-import com.fsck.k9.helper.power.TracingPowerManager.TracingWakeLock;
+import com.fsck.k9.mail.power.TracingPowerManager;
+import com.fsck.k9.mail.power.TracingPowerManager.TracingWakeLock;
 import com.fsck.k9.mail.Address;
 import com.fsck.k9.mail.FetchProfile;
 import com.fsck.k9.mail.Flag;
diff --git a/src/com/fsck/k9/controller/MessagingControllerPushReceiver.java b/k9mail/src/main/java/com/fsck/k9/controller/MessagingControllerPushReceiver.java
similarity index 98%
rename from src/com/fsck/k9/controller/MessagingControllerPushReceiver.java
rename to k9mail/src/main/java/com/fsck/k9/controller/MessagingControllerPushReceiver.java
index 7e471068c..897dbc9cd 100644
--- a/src/com/fsck/k9/controller/MessagingControllerPushReceiver.java
+++ b/k9mail/src/main/java/com/fsck/k9/controller/MessagingControllerPushReceiver.java
@@ -5,7 +5,7 @@ import android.util.Log;
 
 import com.fsck.k9.Account;
 import com.fsck.k9.K9;
-import com.fsck.k9.helper.power.TracingPowerManager.TracingWakeLock;
+import com.fsck.k9.mail.power.TracingPowerManager.TracingWakeLock;
 import com.fsck.k9.mail.Folder;
 
 import com.fsck.k9.mail.Message;
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/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 96%
rename from src/com/fsck/k9/service/CoreReceiver.java
rename to k9mail/src/main/java/com/fsck/k9/service/CoreReceiver.java
index 9d4b4bbdc..ca949f82e 100644
--- a/src/com/fsck/k9/service/CoreReceiver.java
+++ b/k9mail/src/main/java/com/fsck/k9/service/CoreReceiver.java
@@ -11,8 +11,8 @@ import android.os.PowerManager;
 import android.util.Log;
 
 import com.fsck.k9.K9;
-import com.fsck.k9.helper.power.TracingPowerManager;
-import com.fsck.k9.helper.power.TracingPowerManager.TracingWakeLock;
+import com.fsck.k9.mail.power.TracingPowerManager;
+import com.fsck.k9.mail.power.TracingPowerManager.TracingWakeLock;
 
 public class CoreReceiver extends BroadcastReceiver {
 
diff --git a/src/com/fsck/k9/service/CoreService.java b/k9mail/src/main/java/com/fsck/k9/service/CoreService.java
similarity index 99%
rename from src/com/fsck/k9/service/CoreService.java
rename to k9mail/src/main/java/com/fsck/k9/service/CoreService.java
index 4f1aadd7a..2696b55df 100644
--- a/src/com/fsck/k9/service/CoreService.java
+++ b/k9mail/src/main/java/com/fsck/k9/service/CoreService.java
@@ -14,8 +14,8 @@ import android.os.PowerManager;
 import android.util.Log;
 import com.fsck.k9.K9;
 import com.fsck.k9.controller.MessagingController;
-import com.fsck.k9.helper.power.TracingPowerManager;
-import com.fsck.k9.helper.power.TracingPowerManager.TracingWakeLock;
+import com.fsck.k9.mail.power.TracingPowerManager;
+import com.fsck.k9.mail.power.TracingPowerManager.TracingWakeLock;
 
 /**
  * {@code CoreService} is the base class for all K-9 Services.
diff --git a/src/com/fsck/k9/service/DatabaseUpgradeService.java b/k9mail/src/main/java/com/fsck/k9/service/DatabaseUpgradeService.java
similarity index 98%
rename from src/com/fsck/k9/service/DatabaseUpgradeService.java
rename to k9mail/src/main/java/com/fsck/k9/service/DatabaseUpgradeService.java
index d0fe0b5b4..fd89659e8 100644
--- a/src/com/fsck/k9/service/DatabaseUpgradeService.java
+++ b/k9mail/src/main/java/com/fsck/k9/service/DatabaseUpgradeService.java
@@ -15,8 +15,8 @@ import com.fsck.k9.Account;
 import com.fsck.k9.K9;
 import com.fsck.k9.Preferences;
 import com.fsck.k9.activity.UpgradeDatabases;
-import com.fsck.k9.helper.power.TracingPowerManager;
-import com.fsck.k9.helper.power.TracingPowerManager.TracingWakeLock;
+import com.fsck.k9.mail.power.TracingPowerManager;
+import com.fsck.k9.mail.power.TracingPowerManager.TracingWakeLock;
 import com.fsck.k9.mailstore.UnavailableStorageException;
 
 /**
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 97%
rename from src/com/fsck/k9/service/PollService.java
rename to k9mail/src/main/java/com/fsck/k9/service/PollService.java
index 0fbe8d4c0..f47c4e3b8 100644
--- a/src/com/fsck/k9/service/PollService.java
+++ b/k9mail/src/main/java/com/fsck/k9/service/PollService.java
@@ -8,8 +8,8 @@ import android.util.Log;
 import com.fsck.k9.*;
 import com.fsck.k9.controller.MessagingController;
 import com.fsck.k9.controller.MessagingListener;
-import com.fsck.k9.helper.power.TracingPowerManager;
-import com.fsck.k9.helper.power.TracingPowerManager.TracingWakeLock;
+import com.fsck.k9.mail.power.TracingPowerManager;
+import com.fsck.k9.mail.power.TracingPowerManager.TracingWakeLock;
 
 import java.util.HashMap;
 import java.util.Map;
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 98%
rename from src/com/fsck/k9/service/SleepService.java
rename to k9mail/src/main/java/com/fsck/k9/service/SleepService.java
index 07807d737..937f97dc3 100644
--- a/src/com/fsck/k9/service/SleepService.java
+++ b/k9mail/src/main/java/com/fsck/k9/service/SleepService.java
@@ -4,7 +4,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.util.Log;
 import com.fsck.k9.K9;
-import com.fsck.k9.helper.power.TracingPowerManager.TracingWakeLock;
+import com.fsck.k9.mail.power.TracingPowerManager.TracingWakeLock;
 
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CountDownLatch;
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/libs/apache-mime4j-core-0.7.2.jar b/libs/apache-mime4j-core-0.7.2.jar
deleted file mode 100644
index b5c225b5d..000000000
Binary files a/libs/apache-mime4j-core-0.7.2.jar and /dev/null differ
diff --git a/libs/apache-mime4j-dom-0.7.2.jar b/libs/apache-mime4j-dom-0.7.2.jar
deleted file mode 100644
index 0cdd3ce33..000000000
Binary files a/libs/apache-mime4j-dom-0.7.2.jar and /dev/null differ
diff --git a/libs/commons-io-2.0.1.jar b/libs/commons-io-2.0.1.jar
deleted file mode 100644
index 5b64b7d6c..000000000
Binary files a/libs/commons-io-2.0.1.jar and /dev/null differ
diff --git a/libs/htmlcleaner-2.2-all.zip b/libs/htmlcleaner-2.2-all.zip
deleted file mode 100644
index a20cedf53..000000000
Binary files a/libs/htmlcleaner-2.2-all.zip and /dev/null differ
diff --git a/libs/htmlcleaner-2.2.jar b/libs/htmlcleaner-2.2.jar
deleted file mode 100644
index cc922d06b..000000000
Binary files a/libs/htmlcleaner-2.2.jar and /dev/null differ
diff --git a/libs/jutf7-1.0.1-SNAPSHOT.jar b/libs/jutf7-1.0.1-SNAPSHOT.jar
deleted file mode 100644
index 47cdc992d..000000000
Binary files a/libs/jutf7-1.0.1-SNAPSHOT.jar and /dev/null differ
diff --git a/libs/jzlib-1.0.7.jar b/libs/jzlib-1.0.7.jar
deleted file mode 100644
index fae844436..000000000
Binary files a/libs/jzlib-1.0.7.jar and /dev/null differ
diff --git a/plugins/Android-PullToRefresh/library/.project b/plugins/Android-PullToRefresh/library/.project
deleted file mode 100644
index 2f5f232bb..000000000
--- a/plugins/Android-PullToRefresh/library/.project
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>k9mail-Android-PullToRefresh</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/Android-PullToRefresh/library/pom.xml b/plugins/Android-PullToRefresh/library/pom.xml
deleted file mode 100644
index 381eb5375..000000000
--- a/plugins/Android-PullToRefresh/library/pom.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	
-	<groupId>com.github.chrisbanes.pulltorefresh</groupId>
-	<artifactId>library</artifactId>
-	<packaging>apklib</packaging>
-	<name>Android-PullToRefresh Library</name>
-	
-	<parent>
-		<groupId>com.github.chrisbanes.pulltorefresh</groupId>
-		<artifactId>parent</artifactId>
-		<version>2.1.1</version>
-	</parent>
-	
-	<dependencies>
-		<dependency>
-			<groupId>com.google.android</groupId>
-			<artifactId>android</artifactId>
-		</dependency>
-	</dependencies>
-	<build>
-		<plugins>
-			<plugin>
-				<groupId>com.jayway.maven.plugins.android.generation2</groupId>
-				<artifactId>android-maven-plugin</artifactId>
-			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-eclipse-plugin</artifactId>
-			</plugin>
-		</plugins>
-	</build>
-</project>
diff --git a/plugins/Android-PullToRefresh/library/project.properties b/plugins/Android-PullToRefresh/library/project.properties
deleted file mode 100644
index 8e4bc5fdc..000000000
--- a/plugins/Android-PullToRefresh/library/project.properties
+++ /dev/null
@@ -1,12 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must be checked in Version Control Systems.
-#
-# To customize properties used by the Ant build system use,
-# "ant.properties", and override values to adapt the script to your
-# project structure.
-
-# Project target.
-target=android-19
-android.library=true
diff --git a/plugins/Android-PullToRefresh/pom.xml b/plugins/Android-PullToRefresh/pom.xml
deleted file mode 100644
index 516f13b16..000000000
--- a/plugins/Android-PullToRefresh/pom.xml
+++ /dev/null
@@ -1,121 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-	<modelVersion>4.0.0</modelVersion>
-	<groupId>com.github.chrisbanes.pulltorefresh</groupId>
-	<artifactId>parent</artifactId>
-	<packaging>pom</packaging>
-	<version>2.1.1</version>
-	<name>Android-PullToRefresh Project</name>
-	<description>Implementation of the Pull-to-Refresh UI Pattern for Android.</description>
-	<url>https://github.com/chrisbanes/Android-PullToRefresh</url>
-	<parent>
-		<groupId>org.sonatype.oss</groupId>
-		<artifactId>oss-parent</artifactId>
-		<version>7</version>
-	</parent>
-	<licenses>
-		<license>
-			<name>Apache License Version 2.0</name>
-			<url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-			<distribution>repo</distribution>
-		</license>
-	</licenses>
-	<scm>
-		<url>https://github.com/chrisbanes/Android-PullToRefresh</url>
-		<connection>scm:git:git://github.com/chrisbanes/Android-PullToRefresh.git</connection>
-		<developerConnection>scm:git:git@github.com:chrisbanes/Android-PullToRefresh.git</developerConnection>
-	  <tag>v2.1.1</tag>
-  </scm>
-	<developers>
-		<developer>
-			<name>Chris Banes</name>
-			<url>http://about.me/chrisbanes</url>
-			<id>chrisbanes</id>
-		</developer>
-	</developers>
-	<modules>
-		<module>library</module>
-		<module>sample</module>
-		<module>extras</module>
-	</modules>
-	<properties>
-		<!-- build settings -->
-		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-		<java.version>1.6</java.version>
-		<android.version>4.1.1.4</android.version>
-		<android.platform>16</android.platform>
-		<android-maven.version>3.2.0</android-maven.version>
-	</properties>
-	<dependencyManagement>
-		<dependencies>
-			<dependency>
-				<groupId>com.google.android</groupId>
-				<artifactId>android</artifactId>
-				<version>${android.version}</version>
-				<scope>provided</scope>
-			</dependency>
-		</dependencies>
-	</dependencyManagement>
-	<build>
-		<pluginManagement>
-			<plugins>
-				<!-- compiler settings -->
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-compiler-plugin</artifactId>
-					<version>2.3.2</version>
-					<configuration>
-           				<source>${java.version}</source>
-            			<target>${java.version}</target>
-    				</configuration>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-release-plugin</artifactId>
-					<version>2.3.2</version>
-					<configuration>
-						<tagNameFormat>v@{project.version}</tagNameFormat>
-					</configuration>
-				</plugin>
-				<plugin>
-					<groupId>com.jayway.maven.plugins.android.generation2</groupId>
-					<artifactId>android-maven-plugin</artifactId>
-					<version>${android-maven.version}</version>
-					<configuration>
-						<sdk>
-							<platform>${android.platform}</platform>
-						</sdk>
-						<undeployBeforeDeploy>true</undeployBeforeDeploy>
-						<source>${sourceCompatibility}</source>
-						<target>${sourceCompatibility}</target>
-					</configuration>
-					<extensions>true</extensions>
-				</plugin>
-				<plugin>
-					<groupId>org.apache.maven.plugins</groupId>
-					<artifactId>maven-eclipse-plugin</artifactId>
-					<version>2.8</version>
-					<configuration>
-						<excludes>
-							<exclude>com.google.android:android</exclude>
-						</excludes>
-						<buildOutputDirectory>bin</buildOutputDirectory>
-						<classpathContainers>
-							<classpathContainer>com.android.ide.eclipse.adt.ANDROID_FRAMEWORK</classpathContainer>
-						</classpathContainers>
-						<additionalProjectnatures>
-							<projectnature>com.android.ide.eclipse.adt.AndroidNature</projectnature>
-						</additionalProjectnatures>
-						<additionalBuildcommands>
-							<buildcommand>com.android.ide.eclipse.adt.ResourceManagerBuilder</buildcommand>
-							<buildcommand>com.android.ide.eclipse.adt.PreCompilerBuilder</buildcommand>
-							<buildcommand>com.android.ide.eclipse.adt.ApkBuilder</buildcommand>
-						</additionalBuildcommands>
-					</configuration>
-				</plugin>
-			</plugins>
-		</pluginManagement>
-		<sourceDirectory>src</sourceDirectory>
-	</build>
-</project>
diff --git a/plugins/HoloColorPicker/.project b/plugins/HoloColorPicker/.project
deleted file mode 100644
index e43154074..000000000
--- a/plugins/HoloColorPicker/.project
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>k9mail-HoloColorPicker</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/HoloColorPicker/libs/android-support-v4.jar b/plugins/HoloColorPicker/libs/android-support-v4.jar
deleted file mode 100644
index 428bdbc02..000000000
Binary files a/plugins/HoloColorPicker/libs/android-support-v4.jar and /dev/null differ
diff --git a/plugins/HoloColorPicker/pom.xml b/plugins/HoloColorPicker/pom.xml
deleted file mode 100644
index 072a73da4..000000000
--- a/plugins/HoloColorPicker/pom.xml
+++ /dev/null
@@ -1,131 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>com.larswerkman</groupId>
-    <artifactId>colorpicker</artifactId>
-    <packaging>apklib</packaging>
-    <name>Holo ColorPicker</name>
-    <description>A Holo themed colorpicker designed by Marie Schweiz and Nick Butcher.</description>
-    <url>https://github.com/LarsWerkman/HoloColorPicker</url>
-    <parent>
-        <groupId>org.sonatype.oss</groupId>
-        <artifactId>oss-parent</artifactId>
-        <version>7</version>
-    </parent>
-    <licenses>
-        <license>
-            <name>Apache License Version 2.0</name>
-            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-            <distribution>repo</distribution>
-        </license>
-    </licenses>
-    <scm>
-        <url>https://github.com/LarsWerkman/HoloColorPicker</url>
-        <connection>scm:git:git://github.com/LarsWerkman/HoloColorPicker.git</connection>
-        <developerConnection>scm:git:git@github.com:LarsWerkman/HoloColorPicker.git</developerConnection>
-    </scm>
-    <developers>
-        <developer>
-            <name>Lars Werkman</name>
-            <url>http://www.androidviews.net/</url>
-            <id>LarsWerkman</id>
-        </developer>
-    </developers>
-    <properties>
-        <!-- build settings -->
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>1.6</java.version>
-        <android.version>4.1.1.4</android.version>
-        <android.platform>16</android.platform>
-        <android-maven.version>3.2.0</android-maven.version>
-        <android-support.version>r99</android-support.version>
-    </properties>
-    <dependencies>
-        <dependency>
-            <groupId>com.google.android</groupId>
-            <artifactId>android</artifactId>
-            <version>${android.version}</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.google.android</groupId>
-            <artifactId>support-v4</artifactId>
-            <version>${android-support.version}</version>
-            <scope>system</scope>
-            <systemPath>${basedir}/libs/android-support-v4.jar</systemPath>
-        </dependency>
-    </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>com.jayway.maven.plugins.android.generation2</groupId>
-                <artifactId>android-maven-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-eclipse-plugin</artifactId>
-            </plugin>
-        </plugins>
-        <pluginManagement>
-            <plugins>
-                <!-- compiler settings -->
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-compiler-plugin</artifactId>
-                    <version>2.3.2</version>
-                    <configuration>
-                        <source>${java.version}</source>
-                        <target>${java.version}</target>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-release-plugin</artifactId>
-                    <version>2.3.2</version>
-                    <configuration>
-                        <tagNameFormat>v@{project.version}</tagNameFormat>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>com.jayway.maven.plugins.android.generation2</groupId>
-                    <artifactId>android-maven-plugin</artifactId>
-                    <version>${android-maven.version}</version>
-                    <configuration>
-                        <sdk>
-                            <platform>${android.platform}</platform>
-                        </sdk>
-                        <undeployBeforeDeploy>true</undeployBeforeDeploy>
-                        <source>${sourceCompatibility}</source>
-                        <target>${sourceCompatibility}</target>
-                    </configuration>
-                    <extensions>true</extensions>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-eclipse-plugin</artifactId>
-                    <version>2.8</version>
-                    <configuration>
-                        <excludes>
-                            <exclude>com.google.android:android</exclude>
-                        </excludes>
-                        <buildOutputDirectory>bin</buildOutputDirectory>
-                        <classpathContainers>
-                            <classpathContainer>com.android.ide.eclipse.adt.ANDROID_FRAMEWORK</classpathContainer>
-                        </classpathContainers>
-                        <additionalProjectnatures>
-                            <projectnature>com.android.ide.eclipse.adt.AndroidNature</projectnature>
-                        </additionalProjectnatures>
-                        <additionalBuildcommands>
-                            <buildcommand>com.android.ide.eclipse.adt.ResourceManagerBuilder</buildcommand>
-                            <buildcommand>com.android.ide.eclipse.adt.PreCompilerBuilder</buildcommand>
-                            <buildcommand>com.android.ide.eclipse.adt.ApkBuilder</buildcommand>
-                        </additionalBuildcommands>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-        <sourceDirectory>src</sourceDirectory>
-    </build>
-</project>
diff --git a/plugins/HoloColorPicker/project.properties b/plugins/HoloColorPicker/project.properties
deleted file mode 100644
index 91d2b0246..000000000
--- a/plugins/HoloColorPicker/project.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must be checked in Version Control Systems.
-#
-# To customize properties used by the Ant build system edit
-# "ant.properties", and override values to adapt the script to your
-# project structure.
-#
-# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
-#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
-
-# Project target.
-target=android-19
-android.library=true
diff --git a/plugins/ckChangeLog/LICENSE b/plugins/ckChangeLog/LICENSE
deleted file mode 100644
index 7a4a3ea24..000000000
--- a/plugins/ckChangeLog/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
\ No newline at end of file
diff --git a/plugins/ckChangeLog/README.md b/plugins/ckChangeLog/README.md
deleted file mode 100644
index 608d270d8..000000000
--- a/plugins/ckChangeLog/README.md
+++ /dev/null
@@ -1,85 +0,0 @@
-# ckChangeLog - An Android Library to display a Change Log
-
-![Screenshot](screenshot_1.png)
-![Screenshot](screenshot_2.png)
-
-This library provides an easy way to display a change log in your app.
-
-## Features
-
- * Uses a simple XML file as source
- * Supports partial translations
-
-Repository at <https://github.com/cketti/ckChangeLog>.
-
-
-## Usage
-
-1. Create the master change log in `res/xml/changelog_master.xml`. Formatted like this:
-
-  ```xml
-  <?xml version="1.0" encoding="utf-8"?>
-  <changelog>
-      <release version="1.1" versioncode="11" >
-          <change>Totally new and shiny version</change>
-      </release>
-      <release version="1.0" versioncode="10" >
-          <change>Fixed: A bug fix</change>
-          <change>Some other changes I can't quite remember</change>
-      </release>
-      <release version="0.1" versioncode="1">
-          <change>First release</change>
-      </release>
-  </changelog>
-  ```
-
-2. Create translations of this `changelog_master.xml` file in files named `changelog.xml` under
-language-specific versions of `res/xml/`, e.g. `res/xml-de/changelog.xml`.
-
-3. Display the change log dialog by putting the following code in your activity's `onCreate()` method:
-
-  ```java
-  ChangeLog cl = new ChangeLog(this);
-  if (cl.isFirstRun()) {
-      cl.getLogDialog().show();
-  }
-  ```
-
-## Changelog
-
-### Version 1.0.0
-* **Breaking change!** Moved master translation from `res/raw/changelog.xml` to `res/xml/changelog_master.xml`
-* Added German translation of the sample app
-
-### Version 0.1
-* Initial release
-
-
-## Acknowledgments
-
-This library is based on:
-* [android-change-log](http://code.google.com/p/android-change-log/) by Karsten Priegnitz
-* [Inscription](https://github.com/MartinvanZ/Inscription/) by [Martin van Zuilekom](https://github.com/MartinvanZ/)
-
-Other contributors:
-* [Andrew Chen](https://github.com/andrewachen)
-* [Artur Dryomov](https://github.com/ming13)
-* [zjw](https://github.com/zjw)
-* You? Pull requests welcome!
-
-
-## License
-
-    Copyright (C) 2012 Christian Ketterer (cketti)
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
diff --git a/plugins/ckChangeLog/library/.project b/plugins/ckChangeLog/library/.project
deleted file mode 100644
index 70252a0b5..000000000
--- a/plugins/ckChangeLog/library/.project
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>k9mail-ckChangeLog</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/ckChangeLog/library/AndroidManifest.xml b/plugins/ckChangeLog/library/AndroidManifest.xml
deleted file mode 100644
index 03eece148..000000000
--- a/plugins/ckChangeLog/library/AndroidManifest.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="de.cketti.library.changelog"
-    android:versionCode="2"
-    android:versionName="1.0.0" >
-
-    <uses-sdk
-        android:minSdkVersion="7"
-        android:targetSdkVersion="17" />
-
-    <application/>
-
-</manifest>
diff --git a/plugins/ckChangeLog/library/build.gradle b/plugins/ckChangeLog/library/build.gradle
deleted file mode 100644
index 293082bcd..000000000
--- a/plugins/ckChangeLog/library/build.gradle
+++ /dev/null
@@ -1,21 +0,0 @@
-apply plugin: 'com.android.library'
-
-android {
-    compileSdkVersion 21
-    buildToolsVersion '21.1.2'
-
-    sourceSets {
-        main {
-            manifest.srcFile 'AndroidManifest.xml'
-            java.srcDirs = ['src']
-            res.srcDirs = ['res']
-        }
-    }
-
-    // Do not abort build if lint finds errors
-    lintOptions {
-        abortOnError false
-    }
-}
-
-archivesBaseName = 'ckChangeLog'
diff --git a/plugins/ckChangeLog/library/pom.xml b/plugins/ckChangeLog/library/pom.xml
deleted file mode 100644
index 62c598cc6..000000000
--- a/plugins/ckChangeLog/library/pom.xml
+++ /dev/null
@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <modelVersion>4.0.0</modelVersion>
-    <groupId>de.cketti.ckChangeLog</groupId>
-    <artifactId>library</artifactId>
-    <packaging>apklib</packaging>
-    <name>ckChangeLog Library</name>
-    <description>An Android Library to display a Change Log</description>
-    <url>https://github.com/cketti/ckChangeLog</url>
-    <parent>
-        <groupId>org.sonatype.oss</groupId>
-        <artifactId>oss-parent</artifactId>
-        <version>7</version>
-    </parent>
-    <licenses>
-        <license>
-            <name>Apache License Version 2.0</name>
-            <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
-            <distribution>repo</distribution>
-        </license>
-    </licenses>
-    <scm>
-        <url>https://github.com/cketti/ckChangeLog</url>
-        <connection>scm:git:git://github.com/cketti/ckChangeLog.git</connection>
-        <developerConnection>scm:git:git@github.com:cketti/ckChangeLog.git</developerConnection>
-    </scm>
-    <developers>
-        <developer>
-            <name>Christian Ketterer</name>
-            <url>http://cketti.de/</url>
-            <id>cketti</id>
-        </developer>
-    </developers>
-    <properties>
-        <!-- build settings -->
-        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-        <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
-        <java.version>1.6</java.version>
-        <android.version>4.1.1.4</android.version>
-        <android.platform>16</android.platform>
-        <android-maven.version>3.2.0</android-maven.version>
-    </properties>
-    <dependencies>
-        <dependency>
-            <groupId>com.google.android</groupId>
-            <artifactId>android</artifactId>
-            <version>${android.version}</version>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>com.jayway.maven.plugins.android.generation2</groupId>
-                <artifactId>android-maven-plugin</artifactId>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-eclipse-plugin</artifactId>
-            </plugin>
-        </plugins>
-        <pluginManagement>
-            <plugins>
-                <!-- compiler settings -->
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-compiler-plugin</artifactId>
-                    <version>2.3.2</version>
-                    <configuration>
-                        <source>${java.version}</source>
-                        <target>${java.version}</target>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-release-plugin</artifactId>
-                    <version>2.3.2</version>
-                    <configuration>
-                        <tagNameFormat>v@{project.version}</tagNameFormat>
-                    </configuration>
-                </plugin>
-                <plugin>
-                    <groupId>com.jayway.maven.plugins.android.generation2</groupId>
-                    <artifactId>android-maven-plugin</artifactId>
-                    <version>${android-maven.version}</version>
-                    <configuration>
-                        <sdk>
-                            <platform>${android.platform}</platform>
-                        </sdk>
-                        <undeployBeforeDeploy>true</undeployBeforeDeploy>
-                        <source>${sourceCompatibility}</source>
-                        <target>${sourceCompatibility}</target>
-                    </configuration>
-                    <extensions>true</extensions>
-                </plugin>
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-eclipse-plugin</artifactId>
-                    <version>2.8</version>
-                    <configuration>
-                        <excludes>
-                            <exclude>com.google.android:android</exclude>
-                        </excludes>
-                        <buildOutputDirectory>bin</buildOutputDirectory>
-                        <classpathContainers>
-                            <classpathContainer>com.android.ide.eclipse.adt.ANDROID_FRAMEWORK</classpathContainer>
-                        </classpathContainers>
-                        <additionalProjectnatures>
-                            <projectnature>com.android.ide.eclipse.adt.AndroidNature</projectnature>
-                        </additionalProjectnatures>
-                        <additionalBuildcommands>
-                            <buildcommand>com.android.ide.eclipse.adt.ResourceManagerBuilder</buildcommand>
-                            <buildcommand>com.android.ide.eclipse.adt.PreCompilerBuilder</buildcommand>
-                            <buildcommand>com.android.ide.eclipse.adt.ApkBuilder</buildcommand>
-                        </additionalBuildcommands>
-                    </configuration>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-        <sourceDirectory>src</sourceDirectory>
-    </build>
-</project>
\ No newline at end of file
diff --git a/plugins/ckChangeLog/library/project.properties b/plugins/ckChangeLog/library/project.properties
deleted file mode 100644
index 91d2b0246..000000000
--- a/plugins/ckChangeLog/library/project.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must be checked in Version Control Systems.
-#
-# To customize properties used by the Ant build system edit
-# "ant.properties", and override values to adapt the script to your
-# project structure.
-#
-# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
-#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
-
-# Project target.
-target=android-19
-android.library=true
diff --git a/plugins/ckChangeLog/library/res/values-ru/strings.xml b/plugins/ckChangeLog/library/res/values-ru/strings.xml
deleted file mode 100644
index 5f7d1dd2f..000000000
--- a/plugins/ckChangeLog/library/res/values-ru/strings.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="changelog_full_title">Изменения</string>
-    <string name="changelog_title">Что нового</string>
-    <string name="changelog_ok_button">OK</string>
-    <string name="changelog_show_full">Подробнее…</string>
-
-    <string name="changelog_version_format">Версия <xliff:g id="version_name">%s</xliff:g></string>
-</resources>
diff --git a/plugins/ckChangeLog/library/res/values-sk/strings.xml b/plugins/ckChangeLog/library/res/values-sk/strings.xml
deleted file mode 100644
index c408b63ac..000000000
--- a/plugins/ckChangeLog/library/res/values-sk/strings.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="changelog_full_title">Zoznam zmien</string>
-    <string name="changelog_title">Čo je nové</string>
-    <string name="changelog_ok_button">OK</string>
-    <string name="changelog_show_full">Viac…</string>
-
-    <string name="changelog_version_format">Verzia <xliff:g id="version_name">%s</xliff:g></string>
-</resources>
diff --git a/plugins/ckChangeLog/library/res/values/strings.xml b/plugins/ckChangeLog/library/res/values/strings.xml
deleted file mode 100644
index 3c07d7cd9..000000000
--- a/plugins/ckChangeLog/library/res/values/strings.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="changelog_full_title">Change Log</string>
-    <string name="changelog_title">What\'s New</string>
-    <string name="changelog_ok_button">OK</string>
-    <string name="changelog_show_full">More…</string>
-
-    <string name="changelog_version_format">Version <xliff:g id="version_name">%s</xliff:g></string>
-</resources>
\ No newline at end of file
diff --git a/plugins/ckChangeLog/library/res/xml/changelog.xml b/plugins/ckChangeLog/library/res/xml/changelog.xml
deleted file mode 100644
index 59d3cf430..000000000
--- a/plugins/ckChangeLog/library/res/xml/changelog.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<changelog />
\ No newline at end of file
diff --git a/plugins/ckChangeLog/library/res/xml/changelog_master.xml b/plugins/ckChangeLog/library/res/xml/changelog_master.xml
deleted file mode 100644
index d83a85b14..000000000
--- a/plugins/ckChangeLog/library/res/xml/changelog_master.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-The master change log is kept in res/xml/changelog_master.xml.
-Locale specific versions are kept in res/xml-<locale qualifier>/changelog.xml.
--->
-<changelog />
\ No newline at end of file
diff --git a/plugins/ckChangeLog/library/src/de/cketti/library/changelog/ChangeLog.java b/plugins/ckChangeLog/library/src/de/cketti/library/changelog/ChangeLog.java
deleted file mode 100644
index 03b962f25..000000000
--- a/plugins/ckChangeLog/library/src/de/cketti/library/changelog/ChangeLog.java
+++ /dev/null
@@ -1,525 +0,0 @@
-/*
- * Copyright (C) 2012 Christian Ketterer (cketti)
- *
- * Portions Copyright (C) 2012 Martin van Zuilekom (http://martin.cubeactive.com)
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- *
- * Based on android-change-log:
- *
- * Copyright (C) 2011, Karsten Priegnitz
- *
- * Permission to use, copy, modify, and distribute this piece of software
- * for any purpose with or without fee is hereby granted, provided that
- * the above copyright notice and this permission notice appear in the
- * source code of all copies.
- *
- * It would be appreciated if you mention the author in your change log,
- * contributors list or the like.
- *
- * http://code.google.com/p/android-change-log/
- */
-package de.cketti.library.changelog;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.xmlpull.v1.XmlPullParser;
-import org.xmlpull.v1.XmlPullParserException;
-
-import android.app.AlertDialog;
-import android.content.Context;
-import android.content.DialogInterface;
-import android.content.SharedPreferences;
-import android.content.pm.PackageInfo;
-import android.content.pm.PackageManager.NameNotFoundException;
-import android.content.res.Resources;
-import android.content.res.XmlResourceParser;
-import android.preference.PreferenceManager;
-import android.util.Log;
-import android.util.SparseArray;
-import android.webkit.WebView;
-
-
-/**
- * Display a dialog showing a full or partial (What's New) change log.
- */
-public class ChangeLog {
-    /**
-     * Tag that is used when sending error/debug messages to the log.
-     */
-    protected static final String LOG_TAG = "ckChangeLog";
-
-    /**
-     * This is the key used when storing the version code in SharedPreferences.
-     */
-    protected static final String VERSION_KEY = "ckChangeLog_last_version_code";
-
-    /**
-     * Constant that used when no version code is available.
-     */
-    protected static final int NO_VERSION = -1;
-
-    /**
-     * Default CSS styles used to format the change log.
-     */
-    private static final String DEFAULT_CSS =
-            "h1 { margin-left: 0px; font-size: 1.2em;}" +
-            "li { margin-left: 0px;}" +
-            "ul { padding-left: 2em;}";
-
-
-    /**
-     * Context that is used to access the resources and to create the ChangeLog dialogs.
-     */
-    protected final Context mContext;
-
-    /**
-     * Contains the CSS rules used to format the change log.
-     */
-    protected final String mCss;
-
-    /**
-     * Last version code read from {@code SharedPreferences} or {@link #NO_VERSION}.
-     */
-    private int mLastVersionCode;
-
-    /**
-     * Version code of the current installation.
-     */
-    private int mCurrentVersionCode;
-
-    /**
-     * Version name of the current installation.
-     */
-    private String mCurrentVersionName;
-
-
-    /**
-     * Contains constants for the root element of {@code changelog.xml}.
-     */
-    protected interface ChangeLogTag {
-        static final String NAME = "changelog";
-    }
-
-    /**
-     * Contains constants for the release element of {@code changelog.xml}.
-     */
-    protected interface ReleaseTag {
-        static final String NAME = "release";
-        static final String ATTRIBUTE_VERSION = "version";
-        static final String ATTRIBUTE_VERSION_CODE = "versioncode";
-    }
-
-    /**
-     * Contains constants for the change element of {@code changelog.xml}.
-     */
-    protected interface ChangeTag {
-        static final String NAME = "change";
-    }
-
-    /**
-     * Create a {@code ChangeLog} instance using the default {@link SharedPreferences} file.
-     *
-     * @param context
-     *         Context that is used to access the resources and to create the ChangeLog dialogs.
-     */
-    public ChangeLog(Context context) {
-        this(context, PreferenceManager.getDefaultSharedPreferences(context), DEFAULT_CSS);
-    }
-
-    /**
-     * Create a {@code ChangeLog} instance using the default {@link SharedPreferences} file.
-     *
-     * @param context
-     *         Context that is used to access the resources and to create the ChangeLog dialogs.
-     * @param css
-     *         CSS styles that will be used to format the change log.
-     */
-    public ChangeLog(Context context, String css) {
-        this(context, PreferenceManager.getDefaultSharedPreferences(context), css);
-    }
-
-    /**
-     * Create a {@code ChangeLog} instance using the supplied {@code SharedPreferences} instance.
-     *
-     * @param context
-     *         Context that is used to access the resources and to create the ChangeLog dialogs.
-     * @param preferences
-     *         {@code SharedPreferences} instance that is used to persist the last version code.
-     * @param css
-     *         CSS styles used to format the change log (excluding {@code <style>} and
-     *         {@code </style>}).
-     *
-     */
-    public ChangeLog(Context context, SharedPreferences preferences, String css) {
-        mContext = context;
-        mCss = css;
-
-        // Get last version code
-        mLastVersionCode = preferences.getInt(VERSION_KEY, NO_VERSION);
-
-        // Get current version code and version name
-        try {
-            PackageInfo packageInfo = context.getPackageManager().getPackageInfo(
-                    context.getPackageName(), 0);
-
-            mCurrentVersionCode = packageInfo.versionCode;
-            mCurrentVersionName = packageInfo.versionName;
-        } catch (NameNotFoundException e) {
-            mCurrentVersionCode = NO_VERSION;
-            Log.e(LOG_TAG, "Could not get version information from manifest!", e);
-        }
-    }
-
-    /**
-     * Get version code of last installation.
-     *
-     * @return The version code of the last installation of this app (as described in the former
-     *         manifest). This will be the same as returned by {@link #getCurrentVersionCode()} the
-     *         second time this version of the app is launched (more precisely: the second time
-     *         {@code ChangeLog} is instantiated).
-     *
-     * @see AndroidManifest.xml#android:versionCode
-     */
-    public int getLastVersionCode() {
-        return mLastVersionCode;
-    }
-
-    /**
-     * Get version code of current installation.
-     *
-     * @return The version code of this app as described in the manifest.
-     *
-     * @see AndroidManifest.xml#android:versionCode
-     */
-    public int getCurrentVersionCode() {
-        return mCurrentVersionCode;
-    }
-
-    /**
-     * Get version name of current installation.
-     *
-     * @return The version name of this app as described in the manifest.
-     *
-     * @see AndroidManifest.xml#android:versionName
-     */
-    public String getCurrentVersionName() {
-        return mCurrentVersionName;
-    }
-
-    /**
-     * Check if this is the first execution of this app version.
-     *
-     * @return {@code true} if this version of your app is started the first time.
-     */
-    public boolean isFirstRun() {
-        return mLastVersionCode < mCurrentVersionCode;
-    }
-
-    /**
-     * Check if this is a new installation.
-     *
-     * @return {@code true} if your app including {@code ChangeLog} is started the first time ever.
-     *         Also {@code true} if your app was uninstalled and installed again.
-     */
-    public boolean isFirstRunEver() {
-        return mLastVersionCode == NO_VERSION;
-    }
-
-    /**
-     * Get the "What's New" dialog.
-     *
-     * @return An AlertDialog displaying the changes since the previous installed version of your
-     *         app (What's New). But when this is the first run of your app including
-     *         {@code ChangeLog} then the full log dialog is show.
-     */
-    public AlertDialog getLogDialog() {
-        return getDialog(isFirstRunEver());
-    }
-
-    /**
-     * Get a dialog with the full change log.
-     *
-     * @return An AlertDialog with a full change log displayed.
-     */
-    public AlertDialog getFullLogDialog() {
-        return getDialog(true);
-    }
-
-    /**
-     * Create a dialog containing (parts of the) change log.
-     *
-     * @param full
-     *         If this is {@code true} the full change log is displayed. Otherwise only changes for
-     *         versions newer than the last version are displayed.
-     *
-     * @return A dialog containing the (partial) change log.
-     */
-    protected AlertDialog getDialog(boolean full) {
-        WebView wv = new WebView(mContext);
-        //wv.setBackgroundColor(0); // transparent
-        wv.loadDataWithBaseURL(null, getLog(full), "text/html", "UTF-8", null);
-
-        AlertDialog.Builder builder = new AlertDialog.Builder(mContext);
-        builder.setTitle(
-                mContext.getResources().getString(
-                        full ? R.string.changelog_full_title : R.string.changelog_title))
-                .setView(wv)
-                .setCancelable(false)
-                // OK button
-                .setPositiveButton(
-                        mContext.getResources().getString(R.string.changelog_ok_button),
-                        new DialogInterface.OnClickListener() {
-                            @Override
-                            public void onClick(DialogInterface dialog, int which) {
-                                // The user clicked "OK" so save the current version code as
-                                // "last version code".
-                                updateVersionInPreferences();
-                            }
-                        });
-
-        if (!full) {
-            // Show "More…" button if we're only displaying a partial change log.
-            builder.setNegativeButton(R.string.changelog_show_full,
-                    new DialogInterface.OnClickListener() {
-                        @Override
-                        public void onClick(DialogInterface dialog, int id) {
-                            getFullLogDialog().show();
-                        }
-                    });
-        }
-
-        return builder.create();
-    }
-
-    /**
-     * Write current version code to the preferences.
-     */
-    protected void updateVersionInPreferences() {
-        SharedPreferences sp = PreferenceManager.getDefaultSharedPreferences(mContext);
-        SharedPreferences.Editor editor = sp.edit();
-        editor.putInt(VERSION_KEY, mCurrentVersionCode);
-
-        // TODO: Update preferences from a background thread
-        editor.commit();
-    }
-
-    /**
-     * Get changes since last version as HTML string.
-     *
-     * @return HTML string containing the changes since the previous installed version of your app
-     *         (What's New).
-     */
-    public String getLog() {
-        return getLog(false);
-    }
-
-    /**
-     * Get full change log as HTML string.
-     *
-     * @return HTML string containing the full change log.
-     */
-    public String getFullLog() {
-        return getLog(true);
-    }
-
-    /**
-     * Get (partial) change log as HTML string.
-     *
-     * @param full
-     *         If this is {@code true} the full change log is returned. Otherwise only changes for
-     *         versions newer than the last version are returned.
-     *
-     * @return The (partial) change log.
-     */
-    private String getLog(boolean full) {
-        StringBuilder sb = new StringBuilder();
-
-        sb.append("<html><head><style type=\"text/css\">");
-        sb.append(mCss);
-        sb.append("</style></head><body>");
-
-        Resources resources = mContext.getResources();
-
-        // Read master change log from xml/changelog_master.xml
-        XmlResourceParser xml = mContext.getResources().getXml(R.xml.changelog_master);
-        SparseArray<ReleaseItem> defaultChangelog;
-        try {
-            defaultChangelog = readChangeLog(xml, full);
-        } finally {
-            xml.close();
-        }
-
-        // Read localized change log from xml[-lang]/changelog.xml
-        XmlResourceParser resXml = mContext.getResources().getXml(R.xml.changelog);
-        SparseArray<ReleaseItem> changelog;
-        try {
-            changelog = readChangeLog(resXml, full);
-        } finally {
-            resXml.close();
-        }
-
-        String versionFormat = resources.getString(R.string.changelog_version_format);
-
-        // Get all version codes from the master change log...
-        List<Integer> versions = new ArrayList<Integer>(defaultChangelog.size());
-        for (int i = 0, len = defaultChangelog.size(); i < len; i++) {
-            int key = defaultChangelog.keyAt(i);
-            versions.add(key);
-        }
-
-        // ... and sort them (newest version first).
-        Collections.sort(versions, Collections.reverseOrder());
-
-        for (Integer version : versions) {
-            int key = version.intValue();
-
-            // Use release information from localized change log and fall back to the master file
-            // if necessary.
-            ReleaseItem release = changelog.get(key, defaultChangelog.get(key));
-
-            sb.append("<h1>");
-            sb.append(String.format(versionFormat, release.versionName));
-            sb.append("</h1><ul>");
-            for (String change : release.changes) {
-                sb.append("<li>");
-                sb.append(change);
-                sb.append("</li>");
-            }
-            sb.append("</ul>");
-        }
-
-        sb.append("</body></html>");
-
-        return sb.toString();
-    }
-
-    /**
-     * Read the change log from an XML file.
-     *
-     * @param xml
-     *         The {@code XmlPullParser} instance used to read the change log.
-     * @param full
-     *         If {@code true} the full change log is read. Otherwise only the changes since the
-     *         last (saved) version are read.
-     *
-     * @return A {@code SparseArray} mapping the version codes to release information.
-     */
-    protected SparseArray<ReleaseItem> readChangeLog(XmlPullParser xml, boolean full) {
-        SparseArray<ReleaseItem> result = new SparseArray<ReleaseItem>();
-
-        try {
-            int eventType = xml.getEventType();
-            while (eventType != XmlPullParser.END_DOCUMENT) {
-                if (eventType == XmlPullParser.START_TAG && xml.getName().equals(ReleaseTag.NAME)) {
-                    if (parseReleaseTag(xml, full, result)) {
-                        // Stop reading more elements if this entry is not newer than the last
-                        // version.
-                        break;
-                    }
-                }
-                eventType = xml.next();
-            }
-        } catch (XmlPullParserException e) {
-            Log.e(LOG_TAG, e.getMessage(), e);
-        } catch (IOException e) {
-            Log.e(LOG_TAG, e.getMessage(), e);
-        }
-
-        return result;
-    }
-
-    /**
-     * Parse the {@code release} tag of a change log XML file.
-     *
-     * @param xml
-     *         The {@code XmlPullParser} instance used to read the change log.
-     * @param full
-     *         If {@code true} the contents of the {@code release} tag are always added to
-     *         {@code changelog}. Otherwise only if the item's {@code versioncode} attribute is
-     *         higher than the last version code.
-     * @param changelog
-     *         The {@code SparseArray} to add a new {@link ReleaseItem} instance to.
-     *
-     * @return {@code true} if the {@code release} element is describing changes of a version older
-     *         or equal to the last version. In that case {@code changelog} won't be modified and
-     *         {@link #readChangeLog(XmlPullParser, boolean)} will stop reading more elements from
-     *         the change log file.
-     *
-     * @throws XmlPullParserException
-     * @throws IOException
-     */
-    private boolean parseReleaseTag(XmlPullParser xml, boolean full,
-            SparseArray<ReleaseItem> changelog) throws XmlPullParserException, IOException {
-
-        String version = xml.getAttributeValue(null, ReleaseTag.ATTRIBUTE_VERSION);
-
-        int versionCode;
-        try {
-            String versionCodeStr = xml.getAttributeValue(null, ReleaseTag.ATTRIBUTE_VERSION_CODE);
-            versionCode = Integer.parseInt(versionCodeStr);
-        } catch (NumberFormatException e) {
-            versionCode = NO_VERSION;
-        }
-
-        if (!full && versionCode <= mLastVersionCode) {
-            return true;
-        }
-
-        int eventType = xml.getEventType();
-        List<String> changes = new ArrayList<String>();
-        while (eventType != XmlPullParser.END_TAG || xml.getName().equals(ChangeTag.NAME)) {
-            if (eventType == XmlPullParser.START_TAG && xml.getName().equals(ChangeTag.NAME)) {
-                eventType = xml.next();
-
-                changes.add(xml.getText());
-            }
-            eventType = xml.next();
-        }
-
-        ReleaseItem release = new ReleaseItem(versionCode, version, changes);
-        changelog.put(versionCode, release);
-
-        return false;
-    }
-
-    /**
-     * Container used to store information about a release/version.
-     */
-    protected static class ReleaseItem {
-        /**
-         * Version code of the release.
-         */
-        public final int versionCode;
-
-        /**
-         * Version name of the release.
-         */
-        public final String versionName;
-
-        /**
-         * List of changes introduced with that release.
-         */
-        public final List<String> changes;
-
-        ReleaseItem(int versionCode, String versionName, List<String> changes) {
-            this.versionCode = versionCode;
-            this.versionName = versionName;
-            this.changes = changes;
-        }
-    }
-}
diff --git a/plugins/ckChangeLog/screenshot_1.png b/plugins/ckChangeLog/screenshot_1.png
deleted file mode 100644
index 7b0462aa6..000000000
Binary files a/plugins/ckChangeLog/screenshot_1.png and /dev/null differ
diff --git a/plugins/ckChangeLog/screenshot_2.png b/plugins/ckChangeLog/screenshot_2.png
deleted file mode 100644
index efaf3e5af..000000000
Binary files a/plugins/ckChangeLog/screenshot_2.png and /dev/null differ
diff --git a/plugins/openpgp-api-library/.project b/plugins/openpgp-api-library/.project
deleted file mode 100644
index d36aa689f..000000000
--- a/plugins/openpgp-api-library/.project
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>k9mail-openpgp-api-library</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/plugins/openpgp-api-library/project.properties b/plugins/openpgp-api-library/project.properties
deleted file mode 100644
index 91d2b0246..000000000
--- a/plugins/openpgp-api-library/project.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must be checked in Version Control Systems.
-#
-# To customize properties used by the Ant build system edit
-# "ant.properties", and override values to adapt the script to your
-# project structure.
-#
-# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
-#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
-
-# Project target.
-target=android-19
-android.library=true
diff --git a/project.properties b/project.properties
deleted file mode 100644
index 1f49bd1ff..000000000
--- a/project.properties
+++ /dev/null
@@ -1,19 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must be checked in Version Control Systems.
-#
-# To customize properties used by the Ant build system use,
-# "ant.properties", and override values to adapt the script to your
-# project structure.
-
-# Indicates whether an apk should be generated for each density.
-split.density=false
-java.encoding=utf8
-# Project target.
-target=android-19
-extensible.libs.classpath=compile-only-libs
-android.library.reference.1=plugins/Android-PullToRefresh/library
-android.library.reference.2=plugins/ckChangeLog/library
-android.library.reference.3=plugins/HoloColorPicker
-android.library.reference.4=plugins/openpgp-api-library
diff --git a/settings.gradle b/settings.gradle
index 05e675797..a39b9d813 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,5 +1,6 @@
+include ':k9mail'
+include ':k9mail-library'
 include ':plugins:Android-PullToRefresh:library'
-include ':plugins:ckChangeLog:library'
 include ':plugins:HoloColorPicker'
 include ':plugins:openpgp-api-library'
 include ':tests-on-jvm'
diff --git a/tests-on-jvm/.classpath b/tests-on-jvm/.classpath
deleted file mode 100644
index aa8143d4e..000000000
--- a/tests-on-jvm/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/k9mail"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
-	<classpathentry kind="output" path="bin/classes"/>
-</classpath>
diff --git a/tests-on-jvm/.project b/tests-on-jvm/.project
deleted file mode 100644
index 7ab8d956c..000000000
--- a/tests-on-jvm/.project
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>tests-on-jvm</name>
-	<comment></comment>
-	<projects>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/tests-on-jvm/build.gradle b/tests-on-jvm/build.gradle
index ff62c4d92..831e87a39 100644
--- a/tests-on-jvm/build.gradle
+++ b/tests-on-jvm/build.gradle
@@ -8,25 +8,16 @@ apply plugin: 'checkstyle'
 apply plugin: 'jacoco'
 
 dependencies {
-    testCompile project(':')
+    testCompile project(':k9mail')
     testCompile 'junit:junit:4.12'
 }
 
 sourceSets {
-    main {
-        java {
-            srcDirs = []
-        }
-    }
-
     test {
-        compileClasspath += files(rootProject.compileDebugJava.destinationDir)
-        compileClasspath += rootProject.compileDebugJava.classpath
-        runtimeClasspath += files(rootProject.compileDebugJava.destinationDir)
-        runtimeClasspath += rootProject.compileDebugJava.classpath
-        java {
-            srcDirs = ['src']
-        }
+        compileClasspath += files(project(':k9mail').compileDebugJava.destinationDir)
+        compileClasspath += project(':k9mail').compileDebugJava.classpath
+        runtimeClasspath += files(project(':k9mail').compileDebugJava.destinationDir)
+        runtimeClasspath += project(':k9mail').compileDebugJava.classpath
     }
 }
 
@@ -45,4 +36,4 @@ findbugs {
 check.dependsOn 'checkstyleTest'
 check.dependsOn 'findbugsTest'
 
-compileTestJava.dependsOn ':compileDebugJava'
+compileTestJava.dependsOn ':k9mail:compileDebugJava'
diff --git a/tests-on-jvm/gradle/wrapper/gradle-wrapper.jar b/tests-on-jvm/gradle/wrapper/gradle-wrapper.jar
deleted file mode 100644
index 3c7abdf12..000000000
Binary files a/tests-on-jvm/gradle/wrapper/gradle-wrapper.jar and /dev/null differ
diff --git a/tests-on-jvm/gradle/wrapper/gradle-wrapper.properties b/tests-on-jvm/gradle/wrapper/gradle-wrapper.properties
deleted file mode 100644
index 7b73a22d8..000000000
--- a/tests-on-jvm/gradle/wrapper/gradle-wrapper.properties
+++ /dev/null
@@ -1,6 +0,0 @@
-#Tue Apr 29 15:27:38 JST 2014
-distributionBase=GRADLE_USER_HOME
-distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
-zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-1.11-bin.zip
diff --git a/tests-on-jvm/gradlew b/tests-on-jvm/gradlew
deleted file mode 100755
index 91a7e269e..000000000
--- a/tests-on-jvm/gradlew
+++ /dev/null
@@ -1,164 +0,0 @@
-#!/usr/bin/env bash
-
-##############################################################################
-##
-##  Gradle start up script for UN*X
-##
-##############################################################################
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
-
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
-
-warn ( ) {
-    echo "$*"
-}
-
-die ( ) {
-    echo
-    echo "$*"
-    echo
-    exit 1
-}
-
-# OS specific support (must be 'true' or 'false').
-cygwin=false
-msys=false
-darwin=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-esac
-
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
-APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
-
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
-
-# Determine the Java command to use to start the JVM.
-if [ -n "$JAVA_HOME" ] ; then
-    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
-        # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
-    else
-        JAVACMD="$JAVA_HOME/bin/java"
-    fi
-    if [ ! -x "$JAVACMD" ] ; then
-        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-    fi
-else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-
-Please set the JAVA_HOME variable in your environment to match the
-location of your Java installation."
-fi
-
-# Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=$((i+1))
-    done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
-fi
-
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
-}
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
-
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
diff --git a/tests-on-jvm/gradlew.bat b/tests-on-jvm/gradlew.bat
deleted file mode 100644
index 8a0b282aa..000000000
--- a/tests-on-jvm/gradlew.bat
+++ /dev/null
@@ -1,90 +0,0 @@
-@if "%DEBUG%" == "" @echo off
-@rem ##########################################################################
-@rem
-@rem  Gradle startup script for Windows
-@rem
-@rem ##########################################################################
-
-@rem Set local scope for the variables with windows NT shell
-if "%OS%"=="Windows_NT" setlocal
-
-@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS=
-
-set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
-set APP_BASE_NAME=%~n0
-set APP_HOME=%DIRNAME%
-
-@rem Find java.exe
-if defined JAVA_HOME goto findJavaFromJavaHome
-
-set JAVA_EXE=java.exe
-%JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
-
-echo.
-echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:findJavaFromJavaHome
-set JAVA_HOME=%JAVA_HOME:"=%
-set JAVA_EXE=%JAVA_HOME%/bin/java.exe
-
-if exist "%JAVA_EXE%" goto init
-
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
-
-goto fail
-
-:init
-@rem Get command-line arguments, handling Windowz variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-if "%@eval[2+2]" == "4" goto 4NT_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-goto execute
-
-:4NT_args
-@rem Get arguments from the 4NT Shell from JP Software
-set CMD_LINE_ARGS=%$
-
-:execute
-@rem Setup the command line
-
-set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
-
-@rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
-
-:end
-@rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
-
-:fail
-rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
-rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
-
-:mainEnd
-if "%OS%"=="Windows_NT" endlocal
-
-:omega
diff --git a/tests-on-jvm/src/android/text/TextUtils.java b/tests-on-jvm/src/test/java/android/text/TextUtils.java
similarity index 100%
rename from tests-on-jvm/src/android/text/TextUtils.java
rename to tests-on-jvm/src/test/java/android/text/TextUtils.java
diff --git a/tests-on-jvm/src/android/util/Log.java b/tests-on-jvm/src/test/java/android/util/Log.java
similarity index 100%
rename from tests-on-jvm/src/android/util/Log.java
rename to tests-on-jvm/src/test/java/android/util/Log.java
diff --git a/tests-on-jvm/src/com/fsck/k9/K9.java b/tests-on-jvm/src/test/java/com/fsck/k9/K9.java
similarity index 100%
rename from tests-on-jvm/src/com/fsck/k9/K9.java
rename to tests-on-jvm/src/test/java/com/fsck/k9/K9.java
diff --git a/tests-on-jvm/src/com/fsck/k9/activity/TextBodyBuilderTest.java b/tests-on-jvm/src/test/java/com/fsck/k9/activity/TextBodyBuilderTest.java
similarity index 100%
rename from tests-on-jvm/src/com/fsck/k9/activity/TextBodyBuilderTest.java
rename to tests-on-jvm/src/test/java/com/fsck/k9/activity/TextBodyBuilderTest.java
diff --git a/tests-on-jvm/src/com/fsck/k9/mail/AddressTest.java b/tests-on-jvm/src/test/java/com/fsck/k9/mail/AddressTest.java
similarity index 100%
rename from tests-on-jvm/src/com/fsck/k9/mail/AddressTest.java
rename to tests-on-jvm/src/test/java/com/fsck/k9/mail/AddressTest.java
diff --git a/tests-on-jvm/src/com/fsck/k9/mail/Address_quoteAtoms.java b/tests-on-jvm/src/test/java/com/fsck/k9/mail/Address_quoteAtoms.java
similarity index 100%
rename from tests-on-jvm/src/com/fsck/k9/mail/Address_quoteAtoms.java
rename to tests-on-jvm/src/test/java/com/fsck/k9/mail/Address_quoteAtoms.java
diff --git a/tests-on-jvm/src/com/fsck/k9/mail/filter/EOLConvertingOutputStreamTest.java b/tests-on-jvm/src/test/java/com/fsck/k9/mail/filter/EOLConvertingOutputStreamTest.java
similarity index 100%
rename from tests-on-jvm/src/com/fsck/k9/mail/filter/EOLConvertingOutputStreamTest.java
rename to tests-on-jvm/src/test/java/com/fsck/k9/mail/filter/EOLConvertingOutputStreamTest.java
diff --git a/tests-on-jvm/src/com/fsck/k9/mail/internet/CharsetSupportTest.java b/tests-on-jvm/src/test/java/com/fsck/k9/mail/internet/CharsetSupportTest.java
similarity index 100%
rename from tests-on-jvm/src/com/fsck/k9/mail/internet/CharsetSupportTest.java
rename to tests-on-jvm/src/test/java/com/fsck/k9/mail/internet/CharsetSupportTest.java
diff --git a/tests-on-jvm/src/com/fsck/k9/mail/internet/DecoderUtilTest.java b/tests-on-jvm/src/test/java/com/fsck/k9/mail/internet/DecoderUtilTest.java
similarity index 100%
rename from tests-on-jvm/src/com/fsck/k9/mail/internet/DecoderUtilTest.java
rename to tests-on-jvm/src/test/java/com/fsck/k9/mail/internet/DecoderUtilTest.java
diff --git a/tests-on-jvm/src/com/fsck/k9/mail/internet/MimeMessageParseTest.java b/tests-on-jvm/src/test/java/com/fsck/k9/mail/internet/MimeMessageParseTest.java
similarity index 100%
rename from tests-on-jvm/src/com/fsck/k9/mail/internet/MimeMessageParseTest.java
rename to tests-on-jvm/src/test/java/com/fsck/k9/mail/internet/MimeMessageParseTest.java
diff --git a/tests-on-jvm/src/com/fsck/k9/mail/internet/MimeUtilityTest.java b/tests-on-jvm/src/test/java/com/fsck/k9/mail/internet/MimeUtilityTest.java
similarity index 100%
rename from tests-on-jvm/src/com/fsck/k9/mail/internet/MimeUtilityTest.java
rename to tests-on-jvm/src/test/java/com/fsck/k9/mail/internet/MimeUtilityTest.java
diff --git a/tests-on-jvm/src/com/fsck/k9/mail/store/imap/ImapListTest.java b/tests-on-jvm/src/test/java/com/fsck/k9/mail/store/imap/ImapListTest.java
similarity index 100%
rename from tests-on-jvm/src/com/fsck/k9/mail/store/imap/ImapListTest.java
rename to tests-on-jvm/src/test/java/com/fsck/k9/mail/store/imap/ImapListTest.java
diff --git a/tests-on-jvm/src/com/fsck/k9/mail/store/imap/ImapResponseParserTest.java b/tests-on-jvm/src/test/java/com/fsck/k9/mail/store/imap/ImapResponseParserTest.java
similarity index 100%
rename from tests-on-jvm/src/com/fsck/k9/mail/store/imap/ImapResponseParserTest.java
rename to tests-on-jvm/src/test/java/com/fsck/k9/mail/store/imap/ImapResponseParserTest.java
diff --git a/tests-on-jvm/src/com/fsck/k9/mail/store/imap/ImapStoreUriTest.java b/tests-on-jvm/src/test/java/com/fsck/k9/mail/store/imap/ImapStoreUriTest.java
similarity index 100%
rename from tests-on-jvm/src/com/fsck/k9/mail/store/imap/ImapStoreUriTest.java
rename to tests-on-jvm/src/test/java/com/fsck/k9/mail/store/imap/ImapStoreUriTest.java
diff --git a/tests-on-jvm/src/com/fsck/k9/mail/store/imap/ImapUtilityTest.java b/tests-on-jvm/src/test/java/com/fsck/k9/mail/store/imap/ImapUtilityTest.java
similarity index 100%
rename from tests-on-jvm/src/com/fsck/k9/mail/store/imap/ImapUtilityTest.java
rename to tests-on-jvm/src/test/java/com/fsck/k9/mail/store/imap/ImapUtilityTest.java
diff --git a/tests/.classpath b/tests/.classpath
deleted file mode 100644
index 693c66629..000000000
--- a/tests/.classpath
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.LIBRARIES"/>
-	<classpathentry combineaccessrules="false" kind="src" path="/k9mail"/>
-	<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="gen"/>
-	<classpathentry kind="output" path="bin/classes"/>
-</classpath>
diff --git a/tests/.project b/tests/.project
deleted file mode 100644
index b1fe8b246..000000000
--- a/tests/.project
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
-	<name>k9mail-tests</name>
-	<comment></comment>
-	<projects>
-		<project>k9mail</project>
-	</projects>
-	<buildSpec>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ResourceManagerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.PreCompilerBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>org.eclipse.jdt.core.javabuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-		<buildCommand>
-			<name>com.android.ide.eclipse.adt.ApkBuilder</name>
-			<arguments>
-			</arguments>
-		</buildCommand>
-	</buildSpec>
-	<natures>
-		<nature>com.android.ide.eclipse.adt.AndroidNature</nature>
-		<nature>org.eclipse.jdt.core.javanature</nature>
-	</natures>
-</projectDescription>
diff --git a/tests/ant.properties b/tests/ant.properties
deleted file mode 100644
index da0e730c5..000000000
--- a/tests/ant.properties
+++ /dev/null
@@ -1,18 +0,0 @@
-# This file is used to override default values used by the Ant build system.
-#
-# This file must be checked in Version Control Systems, as it is
-# integral to the build system of your project.
-
-# This file is only used by the Ant script.
-
-# You can use this to override default values such as
-#  'source.dir' for the location of your java source folder and
-#  'out.dir' for the location of your output folder.
-
-# You can also use it define how the release builds are signed by declaring
-# the following properties:
-#  'key.store' for the location of your keystore and
-#  'key.alias' for the name of the key to use.
-# The password will be asked during the build when you use the 'release' target.
-
-tested.project.dir=../
diff --git a/tests/build.xml b/tests/build.xml
deleted file mode 100644
index e41722589..000000000
--- a/tests/build.xml
+++ /dev/null
@@ -1,259 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project name="K9Tests" default="help">
-
-    <!-- The local.properties file is created and updated by the 'android' tool.
-         It contains the path to the SDK. It should *NOT* be checked into
-         Version Control Systems. -->
-    <property file="local.properties" />
-
-    <!-- The ant.properties file can be created by you. It is only edited by the
-         'android' tool to add properties to it.
-         This is the place to change some Ant specific build properties.
-         Here are some properties you may want to change/update:
-
-         source.dir
-             The name of the source directory. Default is 'src'.
-         out.dir
-             The name of the output directory. Default is 'bin'.
-
-         For other overridable properties, look at the beginning of the rules
-         files in the SDK, at tools/ant/build.xml
-
-         Properties related to the SDK location or the project target should
-         be updated using the 'android' tool with the 'update' action.
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems.
-
-         -->
-    <property file="ant.properties" />
-
-    <!-- The project.properties file is created and updated by the 'android'
-         tool, as well as ADT.
-
-         This contains project specific properties such as project target, and library
-         dependencies. Lower level build properties are stored in ant.properties
-         (or in .classpath for Eclipse projects).
-
-         This file is an integral part of the build system for your
-         application and should be checked into Version Control Systems. -->
-    <loadproperties srcFile="project.properties" />
-
-    <!-- quick check on sdk.dir -->
-    <fail
-            message="sdk.dir is missing. Make sure to generate local.properties using 'android update project' or to inject it through an env var"
-            unless="sdk.dir"
-    />
-
-    <!--
-        Import per project custom build rules if present at the root of the project.
-        This is the place to put custom intermediary targets such as:
-            -pre-build
-            -pre-compile
-            -post-compile (This is typically used for code obfuscation.
-                           Compiled code location: ${out.classes.absolute.dir}
-                           If this is not done in place, override ${out.dex.input.absolute.dir})
-            -post-package
-            -post-build
-            -pre-clean
-    -->
-    <import file="custom_rules.xml" optional="true" />
-
-    <!-- Import the actual build file.
-
-         To customize existing targets, there are two options:
-         - Customize only one target:
-             - copy/paste the target into this file, *before* the
-               <import> task.
-             - customize it to your needs.
-         - Customize the whole content of build.xml
-             - copy/paste the content of the rules files (minus the top node)
-               into this file, replacing the <import> task.
-             - customize to your needs.
-
-         ***********************
-         ****** IMPORTANT ******
-         ***********************
-         In all cases you must update the value of version-tag below to read 'custom' instead of an integer,
-         in order to avoid having your file be overridden by tools such as "android update project"
-    -->
-    <!-- version-tag: custom -->
-    <import file="${sdk.dir}/tools/ant/build.xml" />
-
-    <!-- K-9 CUSTOM STUFF -->
-
-    <property name="junit-file" location="junit-report.xml" />
-
-    <!-- This is overridden because otherwise it deletes coverage.em after extraction, requiring
-         another compile. Also, test.runner can be changed here instead of in ant.properties, and
-         the code to pull the results is integrated. This likely needs to be updated with every SDK
-         SDK release. Copied from $ANDROID_SDK_HOME/tools/ant/build.xml, Android SDK Tools
-         Revision 20.0.3, and 21 RC4 is not changed. -->
-    <target name="test" depends="-test-project-check"
-                description="OVERRIDE: Runs tests from the package defined in test.package property">
-        <property name="test.runner" value="com.zutubi.android.junitreport.JUnitReportTestRunner" /><!-- ASH changed from original -->
-
-        <if condition="${project.is.test}">
-        <then>
-            <property name="tested.project.absolute.dir" location="${tested.project.dir}" />
-
-            <!-- Application package of the tested project extracted from its manifest file -->
-            <xpath input="${tested.project.absolute.dir}/AndroidManifest.xml"
-                    expression="/manifest/@package" output="tested.project.app.package" />
-
-            <if condition="${emma.enabled}">
-                <then>
-                    <getprojectpaths projectPath="${tested.project.absolute.dir}"
-                            binOut="tested.project.out.absolute.dir"
-                            srcOut="tested.project.source.absolute.dir" />
-
-                    <getlibpath projectPath="${tested.project.absolute.dir}"
-                            libraryFolderPathOut="tested.project.lib.source.path"
-                            leaf="@{source.dir}" />
-
-                </then>
-            </if>
-
-        </then>
-        <else>
-            <!-- this is a test app, the tested package is the app's own package -->
-            <property name="tested.project.app.package" value="${project.app.package}" />
-
-            <if condition="${emma.enabled}">
-                <then>
-                    <property name="tested.project.out.absolute.dir" value="${out.absolute.dir}" />
-                    <property name="tested.project.source.absolute.dir" value="${source.absolute.dir}" />
-
-                    <getlibpath
-                            libraryFolderPathOut="tested.project.lib.source.path"
-                            leaf="@{source.dir}" />
-
-                </then>
-            </if>
-
-        </else>
-        </if>
-
-        <property name="emma.dump.file"
-                value="/data/data/${tested.project.app.package}/coverage.ec" />
-
-        <if condition="${emma.enabled}">
-            <then>
-                <echo>WARNING: Code Coverage is currently only supported on the emulator and rooted devices.</echo>
-                <run-tests-helper emma.enabled="true">
-                    <extra-instrument-args>
-                        <arg value="-e" />
-                           <arg value="coverageFile" />
-                           <arg value="${emma.dump.file}" />
-                    </extra-instrument-args>
-                </run-tests-helper>
-                <echo level="info">Downloading coverage file into project directory...</echo>
-                <exec executable="${adb}" failonerror="true">
-                    <arg line="${adb.device.arg}" />
-                    <arg value="pull" />
-                    <arg value="${emma.dump.file}" />
-                    <arg path="${out.absolute.dir}/coverage.ec" />
-                </exec>
-                <echo level="info">Extracting coverage report...</echo>
-
-                <pathconvert property="tested.project.lib.source.path.value" refid="tested.project.lib.source.path">
-                    <firstmatchmapper>
-                        <regexpmapper from='^([^ ]*)( .*)$$' to='"\1\2"'/>
-                        <identitymapper/>
-                    </firstmatchmapper>
-                </pathconvert>
-
-
-                <emma>
-                    <report sourcepath="${tested.project.source.absolute.dir}:${tested.project.lib.source.path.value}"
-                            verbosity="${verbosity}">
-                        <!-- TODO: report.dir or something like should be introduced if necessary -->
-                        <infileset file="${out.absolute.dir}/coverage.ec" />
-                        <infileset file="${tested.project.out.absolute.dir}/coverage.em" />
-                        <!-- TODO: reports in other, indicated by user formats -->
-                        <html outfile="${out.absolute.dir}/coverage.html" />
-                        <xml outfile="${out.absolute.dir}/coverage.xml" /><!-- ASH added for JUnitReportTestRunner -->
-                   </report>
-                </emma>
-                <!-- ASH commented out from original
-                <echo level="info">Cleaning up temporary files...</echo>
-                <delete file="${out.absolute.dir}/coverage.ec" />
-                <delete file="${out.absolute.dir}/coverage.em" />
-                -->
-                <echo level="info">Saving the report file in ${out.absolute.dir}/coverage.html</echo>
-            </then>
-            <else>
-                <run-tests-helper />
-            </else>
-        </if>
-        <!-- ASH the rest added for JUnitReportTestRunner: -->
-        <echo>Saving the JUnit test report as ${junit-file}</echo>
-        <exec executable="${adb}" failonerror="true">
-            <arg line="${adb.device.arg}"/>
-            <arg value="pull" />
-            <arg value="/data/data/${tested.project.app.package}/files/junit-report.xml" />
-            <arg value="${junit-file}" />
-        </exec>
-    </target>
-
-    <target name="artifacts" description="Copies the apks as unique CloudBees artifacts">
-        <fail unless="env.GIT_BRANCH" message="The environment variable GIT_BRANCH must exist." />
-        <fail unless="env.GIT_COMMIT" message="The environment variable GIT_COMMIT must exist." />
-        <fail unless="env.BUILD_ID" message="The environment variable BUILD_ID must exist." />
-        <fail unless="env.BUILD_NUMBER" message="The environment variable BUILD_NUMBER must exist." />
-
-        <regex property="branch" input="${env.GIT_BRANCH}" regexp="(?:.*/)?(.+)" select="\1" global="true" />
-        <regex property="commit" input="${env.GIT_COMMIT}" regexp="([\da-fA-F]{10})" select="\1" />
-
-        <!-- calls ../build.xml -->
-        <property name="tested.project.absolute.dir" location="${tested.project.dir}" />
-        <condition property="my.project.target" value="-artifacti" else="-artifactd">
-            <isset property="emma.enabled" />
-        </condition>
-        <subant target="${my.project.target}" failonerror="true">
-            <fileset dir="${tested.project.absolute.dir}" includes="build.xml" />
-        </subant>
-
-        <if condition="${build.is.mode.set}">
-            <else>
-                <runtarget target="-set-debug-files" />
-            </else>
-        </if>
-
-        <copy file="${out.final.file}"
-              tofile="${out.dir}/${ant.project.name}-${branch}-${env.BUILD_ID}-${commit}-${env.BUILD_NUMBER}.apk"
-              verbose="on"
-        />
-    </target>
-
-    <target name="-pre-clean" description="Removes testing output">
-        <delete file="${junit-file}" verbose="${verbose}" />
-        <delete file="lint-results.xml" verbose="${verbose}" />
-        <delete file="lint-results.html" verbose="${verbose}" />
-        <delete dir="lint-results_files" verbose="${verbose}" />
-        <delete file="coverage.ec" verbose="${verbose}" />
-        <delete file="coverage.em" verbose="${verbose}" />
-        <delete file="coverage.xml" verbose="${verbose}" />
-        <delete dir="coverage" verbose="${verbose}" />
-        <delete dir="${javadoc-dir}" verbose="${verbose}" />
-    </target>
-
-    <target name="help" depends="android_rules.help">
-        <!-- displays starts at col 13
-              |13                                                              80| -->
-        <echo>Additional targets:</echo>
-        <echo>   javadoc:   Javadoc output to javadoc/. ANDROID_HOME environment</echo>
-        <echo>              variable must be set (i.e. /opt/android-sdk-linux/).</echo>
-        <echo>   lint-xml:  Lint output lint-results.xml.</echo>
-        <echo>   lint-html: Lint output to lint-results.html.</echo>
-        <echo>   test:      Overridden -- also outputs junit-report.xml.</echo>
-        <echo>   artifacts: Copies the apks as unique CloudBees artifacts. Usage:</echo>
-        <echo>                  ant [emma] [debug] artifacts</echo>
-    </target>
-
-    <!-- common to both build.xml and tests/build.xml -->
-    <import file="../build_common.xml" />
-
-    <!-- END K-9 CUSTOM STUFF -->
-
-</project>
diff --git a/tests/clean-tests.sh b/tests/clean-tests.sh
deleted file mode 100755
index 1995ed911..000000000
--- a/tests/clean-tests.sh
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/bin/sh
-
-# clean and run all the tests on an emulator -- only one emulator should be running (a device can be attached).
-# will start and stop an emulator if no emulator is running.
-# name of emulator is given as an argument (no spaces in the name!), or "api7" if not given.
-# starting the emulator requires daemonize which requires a Unix-like system: http://software.clapper.org/daemonize/
-
-# clean
-ant all clean || exit 99
-
-# see if emulator is running, and uninstall package if so
-EMULATOR_ALREADY_RUNNING=false
-if adb devices | grep emulator | grep device$; then
-    ant -Dadb.device.arg=-e uninstall || exit 98
-    EMULATOR_ALREADY_RUNNING=true
-fi
-
-# build project and test project
-time ant emma debug artifacts || exit 1
-
-# start emulator if not running, and uninstall package
-if [ $EMULATOR_ALREADY_RUNNING == false ] ; then
-    if [ -z $1 ]; then
-        AVD_NAME=api7
-    else
-        AVD_NAME=$1
-    fi
-
-    echo starting emulator ${AVD_NAME}
-    daemonize -o /tmp/${AVD_NAME}.stdout -e /tmp/${AVD_NAME}.stderr -p /tmp/${AVD_NAME}.pid -l /tmp/${AVD_NAME}.lock \
-            $ANDROID_HOME/tools/emulator-arm -avd ${AVD_NAME} -no-audio -no-window -no-snapshot-save || exit 97
-    ps ux | grep -f /tmp/${AVD_NAME}.pid | grep emulator || exit 96
-    adb kill-server
-    time adb start-server
-    adb devices
-    #sleep 7
-    adb devices | grep emulator || exit 95
-    echo adb -e wait-for-device
-    time adb -e wait-for-device
-    adb devices | grep device$ || exit 94
-    ant -Dadb.device.arg=-e uninstall || exit 98
-fi
-
-# install project and test project, run tests
-time ant -Dadb.device.arg=-e emma installd test || exit 2
-
-# lint, javadoc, monkey
-cd ..
-time ant lint-xml || exit 3
-time ant javadoc || exit 4
-time ant -Dmonkey.count=200 -Dmonkey.seed=0 monkey || exit 5
-
-# kill emulator if this script started it
-if [ $EMULATOR_ALREADY_RUNNING == false ] ; then
-    adb emu kill || exit 93
-    sleep 1
-    ! ps ux | grep -f /tmp/${AVD_NAME}.pid | grep emulator || exit 92
-    rm -f /tmp/${AVD_NAME}.stdout /tmp/${AVD_NAME}.stderr /tmp/${AVD_NAME}.pid /tmp/${AVD_NAME}.lock
-fi
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 <methods>;
-}
-
--keepclasseswithmembers class * {
-    public <init>(android.content.Context, android.util.AttributeSet);
-}
-
--keepclasseswithmembers class * {
-    public <init>(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 *;
-}
diff --git a/tests/project.properties b/tests/project.properties
deleted file mode 100644
index a5578ba09..000000000
--- a/tests/project.properties
+++ /dev/null
@@ -1,11 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must be checked in Version Control Systems.
-#
-# To customize properties used by the Ant build system use,
-# "ant.properties", and override values to adapt the script to your
-# project structure.
-
-# Project target.
-target=android-19
diff --git a/tools/ant-contrib.jar b/tools/ant-contrib.jar
deleted file mode 100644
index 174cc8035..000000000
Binary files a/tools/ant-contrib.jar and /dev/null differ
diff --git a/tools/build-beta b/tools/build-beta
deleted file mode 100755
index 8061ec9ff..000000000
--- a/tools/build-beta
+++ /dev/null
@@ -1,107 +0,0 @@
-#!/bin/bash
-
-# The MIT License
-#
-# Copyright 2012 Ashley Willis <ashley.github@gmail.com>
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
-
-# Based off original tools/build-beta by Jesse Vincent.
-
-# Works on OS X and Linux.
-
-# Temporarily rename an Android project for building.
-# Set the first 5 or 6 DIST_* and BETA_* to whatever you are going from and to.
-# Set PROJECT_DIR to the absolute path pf the main project.
-# Set TEST_DIR to the absolute path of the test project.
-# Then run this script with the same arguments you'd pass to ant. It can be
-# run from either $PROJECT_DIR or $TEST_DIR. It might require tweaks
-# depending on how your project is laid out.
-
-PROJECT_DIR=.
-TEST_DIR=${PROJECT_DIR}/tests
-
-DIST_TLD=com
-DIST_DOMAIN=fsck
-DIST_PROJECT=k9
-DIST_LOGTAG=k9
-DIST_PROJ_NAME=K9
-DIST_APP_NAME='\@string/app_name'
-
-BETA_TLD=com
-BETA_DOMAIN=fsck
-BETA_PROJECT=k9beta
-BETA_LOGTAG=k9beta
-BETA_PROJ_NAME='K9 Beta'
-BETA_APP_NAME='K-9 Beta'
-
-# Nothing below here should need to be changed.
-
-DIST_PACKAGE="${DIST_TLD}.${DIST_DOMAIN}.${DIST_PROJECT}"
-DIST_PATH="${DIST_TLD}/${DIST_DOMAIN}/${DIST_PROJECT}"
-
-BETA_PACKAGE="${BETA_TLD}.${BETA_DOMAIN}.${BETA_PROJECT}"
-BETA_PATH="${BETA_TLD}/${BETA_DOMAIN}/${BETA_PROJECT}"
-
-# convert to beta project:
-perl -pi -e"s|${DIST_APP_NAME}|${BETA_APP_NAME}|g" ${PROJECT_DIR}/AndroidManifest.xml
-perl -pi -e"s|${DIST_PACKAGE}|${BETA_PACKAGE}|g" ${PROJECT_DIR}/AndroidManifest.xml ${TEST_DIR}/AndroidManifest.xml
-perl -pi -e"s|${DIST_PROJ_NAME}|${BETA_PROJ_NAME}|g" ${PROJECT_DIR}/build.xml ${TEST_DIR}/build.xml
-perl -pi -e"s|LOG_TAG = \"${DIST_LOGTAG}\"|LOG_TAG = \"${BETA_LOGTAG}\"|" ${PROJECT_DIR}/src/${DIST_PATH}/${DIST_PROJ_NAME}.java
-find ${PROJECT_DIR}/src/${DIST_TLD}/${DIST_DOMAIN} ${PROJECT_DIR}/res ${TEST_DIR}/src/${DIST_TLD}/${DIST_DOMAIN} ${TEST_DIR}/res \
-        -type f -print0 | xargs -0 perl -pi -e"s/${DIST_PACKAGE}(?=\W)/${BETA_PACKAGE}/g"
-if [[ "${DIST_PROJECT}" != "${BETA_PROJECT}" ]]; then
-    mv ${PROJECT_DIR}/src/${DIST_TLD}/${DIST_DOMAIN}/${DIST_PROJECT} ${PROJECT_DIR}/src/${DIST_TLD}/${DIST_DOMAIN}/${BETA_PROJECT}
-    mv ${TEST_DIR}/src/${DIST_TLD}/${DIST_DOMAIN}/${DIST_PROJECT} ${TEST_DIR}/src/${DIST_TLD}/${DIST_DOMAIN}/${BETA_PROJECT}
-fi
-if [[ "${DIST_DOMAIN}" != "${BETA_DOMAIN}" ]]; then
-    mv ${PROJECT_DIR}/src/${DIST_TLD}/${DIST_DOMAIN} ${PROJECT_DIR}/src/${DIST_TLD}/${BETA_DOMAIN}
-    mv ${TEST_DIR}/src/${DIST_TLD}/${DIST_DOMAIN} ${TEST_DIR}/src/${DIST_TLD}/${BETA_DOMAIN}
-fi
-if [[ "${DIST_TLD}" != "${BETA_TLD}" ]]; then
-    mv ${PROJECT_DIR}/src/${DIST_TLD} ${PROJECT_DIR}/src/${BETA_TLD}
-    mv ${TEST_DIR}/src/${DIST_TLD} ${TEST_DIR}/src/${BETA_TLD}
-fi
-
-# do ant and save exit status:
-ant $@
-MYEXIT=$?
-
-# convert back to normal project:
-if [[ "${DIST_TLD}" != "${BETA_TLD}" ]]; then
-    mv ${PROJECT_DIR}/src/${BETA_TLD} ${PROJECT_DIR}/src/${DIST_TLD}
-    mv ${TEST_DIR}/src/${BETA_TLD} ${TEST_DIR}/src/${DIST_TLD}
-fi
-if [[ "${DIST_DOMAIN}" != "${BETA_DOMAIN}" ]]; then
-    mv ${PROJECT_DIR}/src//${DIST_TLD}/${BETA_DOMAIN} ${PROJECT_DIR}/src/${DIST_TLD}/${DIST_DOMAIN}
-    mv ${TEST_DIR}/src//${DIST_TLD}/${BETA_DOMAIN} ${TEST_DIR}/src/${DIST_TLD}/${DIST_DOMAIN}
-fi
-if [[ "${DIST_PROJECT}" != "${BETA_PROJECT}" ]]; then
-    mv ${PROJECT_DIR}/src/${DIST_TLD}/${DIST_DOMAIN}/${BETA_PROJECT} ${PROJECT_DIR}/src/${DIST_TLD}/${DIST_DOMAIN}/${DIST_PROJECT}
-    mv ${TEST_DIR}/src/${DIST_TLD}/${DIST_DOMAIN}/${BETA_PROJECT} ${TEST_DIR}/src/${DIST_TLD}/${DIST_DOMAIN}/${DIST_PROJECT}
-fi
-find ${PROJECT_DIR}/src/${DIST_TLD}/${DIST_DOMAIN} ${PROJECT_DIR}/res ${TEST_DIR}/src/${DIST_TLD}/${DIST_DOMAIN} ${TEST_DIR}/res \
-        -type f -print0 | xargs -0 perl -pi -e"s/${BETA_PACKAGE}(?=\W)/${DIST_PACKAGE}/g"
-perl -pi -e"s|LOG_TAG = \"${BETA_LOGTAG}\"|LOG_TAG = \"${DIST_LOGTAG}\"|" ${PROJECT_DIR}/src/${DIST_PATH}/${DIST_PROJ_NAME}.java
-perl -pi -e"s|${BETA_PROJ_NAME}|${DIST_PROJ_NAME}|g" ${PROJECT_DIR}/build.xml ${TEST_DIR}/build.xml
-perl -pi -e"s|${BETA_PACKAGE}|${DIST_PACKAGE}|g" ${PROJECT_DIR}/AndroidManifest.xml ${TEST_DIR}/AndroidManifest.xml
-perl -pi -e"s|${BETA_APP_NAME}|${DIST_APP_NAME}|g" ${PROJECT_DIR}/AndroidManifest.xml
-
-# exit with value from ant:
-exit ${MYEXIT}