diff --git a/botejars/custom_rules.xml b/botejars/custom_rules.xml
index d202a8b..e439a6b 100644
--- a/botejars/custom_rules.xml
+++ b/botejars/custom_rules.xml
@@ -78,7 +78,8 @@
     <target name="copybotelibs" depends="-dirs,buildbote">
         <!-- bote -->
         <copy todir="${jar.libs.dir}">
-            <fileset dir="${botebase}/WebContent/WEB-INF/lib" />
+            <!-- Regular JavaMail currently doesn't work on Android -->
+            <fileset dir="${botebase}/WebContent/WEB-INF/lib" excludes="mailapi.jar" />
         </copy>
     </target>
 </project>
diff --git a/libs/activation.jar b/libs/activation.jar
new file mode 100644
index 0000000..614a03c
Binary files /dev/null and b/libs/activation.jar differ
diff --git a/libs/additionnal.jar b/libs/additionnal.jar
new file mode 100644
index 0000000..aeb9611
Binary files /dev/null and b/libs/additionnal.jar differ
diff --git a/libs/mail.jar b/libs/mail.jar
new file mode 100644
index 0000000..ea594fd
Binary files /dev/null and b/libs/mail.jar differ
diff --git a/project.properties b/project.properties
index 83a67be..2987131 100644
--- a/project.properties
+++ b/project.properties
@@ -10,6 +10,7 @@
 # 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
 
+dex.force.jumbo=true
 # Project target.
 target=android-19
 # Bote libs
diff --git a/src/i2p/bote/EmailListAdapter.java b/src/i2p/bote/EmailListAdapter.java
index 7633060..1dfcc0d 100644
--- a/src/i2p/bote/EmailListAdapter.java
+++ b/src/i2p/bote/EmailListAdapter.java
@@ -52,9 +52,7 @@ public class EmailListAdapter extends ArrayAdapter<Email> {
         } catch (GeneralSecurityException e) {
             subject.setText("ERROR: " + e.getMessage());
         }
-        // TODO: Fix library bugs
-        // The .jar files are getting classes stripped during dexing.
-        //content.setText(email.getText());
+        content.setText(email.getText());
 
         return v;
     }