diff --git a/res/layout/message.xml b/res/layout/message.xml
index 1e77062af..8e425eb71 100644
--- a/res/layout/message.xml
+++ b/res/layout/message.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout 
+<com.fsck.k9.view.SingleMessageView
     android:id="@+id/message_view"
             android:orientation="vertical"
             android:layout_width="fill_parent"
@@ -223,4 +223,4 @@
         android:layout_height="wrap_content"
         android:visibility="gone"
         android:layout_width="fill_parent" />
-</LinearLayout>
+</com.fsck.k9.view.SingleMessageView>
diff --git a/src/com/fsck/k9/view/SingleMessageView.java b/src/com/fsck/k9/view/SingleMessageView.java
new file mode 100644
index 000000000..7ae7872a0
--- /dev/null
+++ b/src/com/fsck/k9/view/SingleMessageView.java
@@ -0,0 +1,13 @@
+package com.fsck.k9.view;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.widget.LinearLayout;
+
+/**
+ */
+public class SingleMessageView extends LinearLayout{
+    public SingleMessageView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+    }
+}