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/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.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/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/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/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/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/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/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/.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/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}