diff --git a/Android.mk b/Android.mk
index 084b4ee17..2081c3615 100644
--- a/Android.mk
+++ b/Android.mk
@@ -58,4 +58,3 @@ ifeq ($(strip $(LOCAL_PACKAGE_OVERRIDES)),)
 # additionally, build unit tests in a separate .apk
 include $(call all-makefiles-under,$(LOCAL_PATH))
 endif
-
diff --git a/CleanSpec.mk b/CleanSpec.mk
index 301964122..8a60b6966 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -48,4 +48,6 @@
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
 # ************************************************
 $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/com.android.email*)
+$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Email*)
+$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/com.android.email*)
 $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Email*)
\ No newline at end of file
diff --git a/Imap2/Android.mk b/Imap2/Android.mk
new file mode 100644
index 000000000..cc2ceb7ad
--- /dev/null
+++ b/Imap2/Android.mk
@@ -0,0 +1,21 @@
+# Copyright 2012, The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+include $(CLEAR_VARS)
+
+LOCAL_MODULE := Imap2
+LOCAL_MODULE_TAGS := optional
+
+include $(BUILD_PHONY_PACKAGE)