diff --git a/k9mail-library/build.gradle b/k9mail-library/build.gradle
index 27fcd488e..ad6a7fceb 100644
--- a/k9mail-library/build.gradle
+++ b/k9mail-library/build.gradle
@@ -9,7 +9,7 @@ repositories {
 dependencies {
     compile 'org.apache.james:apache-mime4j-core:0.7.2'
     compile 'org.apache.james:apache-mime4j-dom:0.7.2'
-    compile 'commons-io:commons-io:2.0.1'
+    compile 'commons-io:commons-io:2.4'
     compile 'com.jcraft:jzlib:1.0.7'
     compile 'com.beetstra.jutf7:jutf7:1.0.0'
 }
diff --git a/k9mail/build.gradle b/k9mail/build.gradle
index 8fc4877a1..97d2a5dfd 100644
--- a/k9mail/build.gradle
+++ b/k9mail/build.gradle
@@ -12,10 +12,10 @@ dependencies {
     compile project(':plugins:Android-PullToRefresh:library')
     compile project(':plugins:HoloColorPicker')
     compile project(':plugins:openpgp-api-library')
-    compile 'commons-io:commons-io:2.0.1'
+    compile 'commons-io:commons-io:2.4'
     compile 'com.android.support:support-v4:21.0.2'
     compile 'com.android.support:support-v13:21.0.2'
-    compile 'net.sourceforge.htmlcleaner:htmlcleaner:2.2'
+    compile 'net.sourceforge.htmlcleaner:htmlcleaner:2.10'
     compile 'de.cketti.library.changelog:ckchangelog:1.2.1'
 }
 
diff --git a/k9mail/src/main/java/com/fsck/k9/activity/MessageCompose.java b/k9mail/src/main/java/com/fsck/k9/activity/MessageCompose.java
index ff8cbc28d..40a8c6ac3 100644
--- a/k9mail/src/main/java/com/fsck/k9/activity/MessageCompose.java
+++ b/k9mail/src/main/java/com/fsck/k9/activity/MessageCompose.java
@@ -3173,12 +3173,7 @@ public class MessageCompose extends K9Activity implements OnClickListener,
 
                 TagNode node = cleaner.clean(content);
                 SimpleHtmlSerializer htmlSerialized = new SimpleHtmlSerializer(properties);
-                try {
-                    content = htmlSerialized.getAsString(node, "UTF8");
-                } catch (java.io.IOException ioe) {
-                    // Can't imagine this happening.
-                    Log.e(K9.LOG_TAG, "Problem cleaning quoted message.", ioe);
-                }
+                content = htmlSerialized.getAsString(node, "UTF8");
             }
 
             // Add the HTML reply header to the top of the content.