diff --git a/build.gradle b/build.gradle
index 1e1fede4d..5945c5b5b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -23,7 +23,15 @@ dependencies {
     compile project(':plugins:HoloColorPicker')
     compile project(':plugins:openpgp-api-library')
     compile 'com.android.support:support-v13:19.1.0'
-    compile fileTree(dir: 'libs', include: '*.jar')
+    compile fileTree(dir: 'libs', include: 'jutf*.jar')
+
+    // compile 'com.beetstra.jutf7:jutf7:1.0.1-SNAPSHOT'
+
+    compile 'net.sourceforge.htmlcleaner:htmlcleaner:2.2'
+    compile 'org.apache.james:apache-mime4j-core:0.7.2'
+    compile 'org.apache.james:apache-mime4j-dom:0.7.2'
+    compile 'com.jcraft:jzlib:1.0.7'
+    compile 'commons-io:commons-io:2.0.1'
 }
 
 project.ext.preDexLibs = !project.hasProperty('disablePreDex')
@@ -83,7 +91,9 @@ android {
     packagingOptions {
         exclude 'META-INF/DEPENDENCIES'
         exclude 'META-INF/LICENSE'
+        exclude 'META-INF/LICENSE.txt'
         exclude 'META-INF/NOTICE'
+        exclude 'META-INF/NOTICE.txt'
     }
 }