diff --git a/src/com/android/email/activity/MessageView.java b/src/com/android/email/activity/MessageView.java
index 352a41f2b..de9b188b2 100644
--- a/src/com/android/email/activity/MessageView.java
+++ b/src/com/android/email/activity/MessageView.java
@@ -781,6 +781,9 @@ public class MessageView extends Activity
     }
 
     private void renderAttachments(Part part, int depth) throws MessagingException {
+        if (depth >= 10 || part == null) {
+            return;
+        }
         String contentType = MimeUtility.unfoldAndDecode(part.getContentType());
         String name = MimeUtility.getHeaderParameter(contentType, "name");
         if (name != null) {