diff --git a/src/com/fsck/k9/mail/internet/MimeUtility.java b/src/com/fsck/k9/mail/internet/MimeUtility.java
index a0a55635e..2db9d6812 100644
--- a/src/com/fsck/k9/mail/internet/MimeUtility.java
+++ b/src/com/fsck/k9/mail/internet/MimeUtility.java
@@ -398,6 +398,15 @@ public class MimeUtility
                     return result;
                 }
             }
+
+        }
+        catch (OutOfMemoryError oom)
+        {
+            /*
+             * If we are not able to process the body there's nothing we can do about it. Return
+             * null and let the upper layers handle the missing content.
+             */
+            Log.e(K9.LOG_TAG, "Unable to getTextFromPart " + oom.toString());
         }
         catch (Exception e)
         {