From 594b3291acfe03610bb0be3b211a4d921299fce0 Mon Sep 17 00:00:00 2001
From: Jesse Vincent <jesse@bestpractical.com>
Date: Thu, 10 Feb 2011 17:57:54 -0500
Subject: [PATCH] move the messageview from a merge to a linearlayout

---
 res/layout/message_view.xml        |  2 +-
 res/layout/message_view_header.xml | 11 +++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/res/layout/message_view.xml b/res/layout/message_view.xml
index 209549f32..2505c904d 100644
--- a/res/layout/message_view.xml
+++ b/res/layout/message_view.xml
@@ -18,7 +18,7 @@
             android:orientation="vertical"
             android:layout_width="fill_parent"
             android:background="@android:color/transparent"
-            android:layout_height="0dip"
+            android:layout_height="wrap_content"
             android:layout_weight="1">
             <include layout="@layout/message_view_header" />
             <include layout="@layout/message_view_scrolling_buttons"/>
diff --git a/res/layout/message_view_header.xml b/res/layout/message_view_header.xml
index dd1feafa1..1e77062af 100644
--- a/res/layout/message_view_header.xml
+++ b/res/layout/message_view_header.xml
@@ -1,5 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
+<LinearLayout 
+    android:id="@+id/message_view"
+            android:orientation="vertical"
+            android:layout_width="fill_parent"
+            android:background="@android:color/transparent"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+ xmlns:android="http://schemas.android.com/apk/res/android">
     <!-- Header area -->
     <com.fsck.k9.view.MessageHeader
         android:id="@+id/header_container"
@@ -216,4 +223,4 @@
         android:layout_height="wrap_content"
         android:visibility="gone"
         android:layout_width="fill_parent" />
-</merge>
+</LinearLayout>