diff --git a/HoloColorPicker.iml b/HoloColorPicker.iml
new file mode 100644
index 000000000..a256227a9
--- /dev/null
+++ b/HoloColorPicker.iml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="android" name="Android">
+      <configuration>
+        <option name="GEN_FOLDER_RELATIVE_PATH_APT" value="/plugins/HoloColorPicker/target/generated-sources/r" />
+        <option name="GEN_FOLDER_RELATIVE_PATH_AIDL" value="/plugins/HoloColorPicker/target/generated-sources/aidl" />
+        <option name="MANIFEST_FILE_RELATIVE_PATH" value="/plugins/HoloColorPicker/AndroidManifest.xml" />
+        <option name="RES_FOLDER_RELATIVE_PATH" value="/plugins/HoloColorPicker/res" />
+        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/plugins/HoloColorPicker/assets" />
+        <option name="LIBS_FOLDER_RELATIVE_PATH" value="/plugins/HoloColorPicker/ignored" />
+        <option name="USE_CUSTOM_APK_RESOURCE_FOLDER" value="false" />
+        <option name="CUSTOM_APK_RESOURCE_FOLDER" value="/plugins/HoloColorPicker/target/generated-sources/combined-resources/res" />
+        <option name="USE_CUSTOM_COMPILER_MANIFEST" value="false" />
+        <option name="CUSTOM_COMPILER_MANIFEST" value="" />
+        <option name="APK_PATH" value="/plugins/HoloColorPicker/target/colorpicker.apk" />
+        <option name="LIBRARY_PROJECT" value="true" />
+        <option name="RUN_PROCESS_RESOURCES_MAVEN_TASK" value="false" />
+        <option name="GENERATE_UNSIGNED_APK" value="false" />
+        <option name="CUSTOM_DEBUG_KEYSTORE_PATH" value="" />
+        <option name="PACK_TEST_CODE" value="false" />
+        <option name="RUN_PROGUARD" value="false" />
+        <option name="PROGUARD_CFG_PATH" value="/proguard-project.txt" />
+        <resOverlayFolders>
+          <path>/plugins/HoloColorPicker/res-overlay</path>
+        </resOverlayFolders>
+        <includeSystemProguardFile>true</includeSystemProguardFile>
+        <includeAssetsFromLibraries>true</includeAssetsFromLibraries>
+        <additionalNativeLibs />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/plugins/HoloColorPicker/target/classes" />
+    <output-test url="file://$MODULE_DIR$/plugins/HoloColorPicker/target/test-classes" />
+    <content url="file://$MODULE_DIR$/plugins/HoloColorPicker">
+      <sourceFolder url="file://$MODULE_DIR$/plugins/HoloColorPicker/target/generated-sources/r" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/plugins/HoloColorPicker/gen" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/plugins/HoloColorPicker/src" isTestSource="false" />
+      <excludeFolder url="file://$MODULE_DIR$/plugins/HoloColorPicker/target/classes" />
+      <excludeFolder url="file://$MODULE_DIR$/plugins/HoloColorPicker/target/generated-sources/combined-assets" />
+      <excludeFolder url="file://$MODULE_DIR$/plugins/HoloColorPicker/target/generated-sources/combined-resources" />
+      <excludeFolder url="file://$MODULE_DIR$/plugins/HoloColorPicker/target/generated-sources/extracted-dependencies" />
+      <excludeFolder url="file://$MODULE_DIR$/plugins/HoloColorPicker/target/test-classes" />
+    </content>
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.android:android:4.1.1.4" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: commons-logging:commons-logging:1.1.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.httpcomponents:httpclient:4.0.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.httpcomponents:httpcore:4.0.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: commons-codec:commons-codec:1.3" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.khronos:opengl-api:gl1.1-android-2.1_r1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: xerces:xmlParserAPIs:2.6.2" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: xpp3:xpp3:1.1.4c" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.json:json:20080701" level="project" />
+    <orderEntry type="library" name="Maven: com.google.android:support-v4:r99" level="project" />
+    <orderEntry type="inheritedJdk" />
+  </component>
+</module>
+
diff --git a/k9mail.iml b/k9mail.iml
index 0ef93abec..fa9063006 100644
--- a/k9mail.iml
+++ b/k9mail.iml
@@ -45,6 +45,7 @@
     <orderEntry type="module" module-name="ActionBarSherlock" />
     <orderEntry type="module" module-name="Android-PullToRefresh" />
     <orderEntry type="module" module-name="ckChangeLog" />
+    <orderEntry type="module" module-name="HoloColorPicker" />
     <orderEntry type="inheritedJdk" />
   </component>
 </module>
diff --git a/k9mail.ipr b/k9mail.ipr
index ce392dc02..4d3ad635b 100644
--- a/k9mail.ipr
+++ b/k9mail.ipr
@@ -126,6 +126,8 @@
       <directory url="file://$PROJECT_DIR$/plugins/ckChangeLog/library/target/generated-test-sources/test-annotations" includeSubdirectories="true" />
       <directory url="file://$PROJECT_DIR$/plugins/ActionBarSherlock/library/target/generated-sources/annotations" includeSubdirectories="true" />
       <directory url="file://$PROJECT_DIR$/plugins/ActionBarSherlock/library/target/generated-test-sources/test-annotations" includeSubdirectories="true" />
+      <directory url="file://$PROJECT_DIR$/plugins/HoloColorPicker/target/generated-sources/r" includeSubdirectories="true" />
+      <directory url="file://$PROJECT_DIR$/plugins/HoloColorPicker/library/target/generated-sources/r" includeSubdirectories="true" />
     </excludeFromCompile>
     <resourceExtensions>
       <entry name=".+\.(properties|xml|html|dtd|tld)" />
@@ -155,12 +157,15 @@
         <module name="ActionBarSherlock" />
         <module name="Android-PullToRefresh" />
         <module name="ckChangeLog" />
+        <module name="HoloColorPicker" />
       </profile>
     </annotationProcessing>
     <bytecodeTargetLevel>
       <module name="ActionBarSherlock" target="1.6" />
       <module name="Android-PullToRefresh" target="1.6" />
       <module name="ckChangeLog" target="1.6" />
+      <module name="colorpicker" target="1.6" />
+      <module name="HoloColorPicker" target="1.6" />
       <module name="k9mail" target="1.6" />
     </bytecodeTargetLevel>
   </component>
@@ -174,6 +179,7 @@
     <file url="file://$PROJECT_DIR$" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/plugins/ActionBarSherlock/library" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/plugins/Android-PullToRefresh/library" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/plugins/HoloColorPicker" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/plugins/ckChangeLog/library" charset="UTF-8" />
   </component>
   <component name="EntryPointsManager">
@@ -232,6 +238,7 @@
         <option value="$PROJECT_DIR$/plugins/ActionBarSherlock/library/pom.xml" />
         <option value="$PROJECT_DIR$/plugins/Android-PullToRefresh/library/pom.xml" />
         <option value="$PROJECT_DIR$/plugins/ckChangeLog/library/pom.xml" />
+        <option value="$PROJECT_DIR$/plugins/HoloColorPicker/pom.xml" />
       </list>
     </option>
   </component>
@@ -402,6 +409,7 @@
     <modules>
       <module fileurl="file://$PROJECT_DIR$/ActionBarSherlock.iml" filepath="$PROJECT_DIR$/ActionBarSherlock.iml" />
       <module fileurl="file://$PROJECT_DIR$/Android-PullToRefresh.iml" filepath="$PROJECT_DIR$/Android-PullToRefresh.iml" />
+      <module fileurl="file://$PROJECT_DIR$/HoloColorPicker.iml" filepath="$PROJECT_DIR$/HoloColorPicker.iml" />
       <module fileurl="file://$PROJECT_DIR$/ckChangeLog.iml" filepath="$PROJECT_DIR$/ckChangeLog.iml" />
       <module fileurl="file://$PROJECT_DIR$/k9mail.iml" filepath="$PROJECT_DIR$/k9mail.iml" />
     </modules>
diff --git a/plugins/HoloColorPicker/pom.xml b/plugins/HoloColorPicker/pom.xml
new file mode 100644
index 000000000..072a73da4
--- /dev/null
+++ b/plugins/HoloColorPicker/pom.xml
@@ -0,0 +1,131 @@
+<?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>