diff --git a/Android.mk b/Android.mk
index 60d471196..cfdf52dda 100644
--- a/Android.mk
+++ b/Android.mk
@@ -56,6 +56,8 @@ LOCAL_STATIC_JAVA_LIBRARIES += android-opt-bitmap
 LOCAL_STATIC_JAVA_LIBRARIES += android-opt-datetimepicker
 LOCAL_STATIC_JAVA_LIBRARIES += owasp-html-sanitizer
 
+LOCAL_JAVA_LIBRARIES := org.apache.http.legacy
+
 LOCAL_PACKAGE_NAME := Email
 
 LOCAL_PROGUARD_FLAG_FILES := proguard.flags $(unified_email_dir)/proguard.flags
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index dcb684ab8..e0b9dd8d9 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -85,6 +85,8 @@
         android:hardwareAccelerated="true"
         android:allowBackup="false"
         android:supportsRtl="true" >
+
+        <uses-library android:name="org.apache.http.legacy" android:required="false" />
         <activity
             android:name="com.android.email.activity.ComposeActivityEmail"
             android:label="@string/app_name"