From 7c97527d733a92f7dcd7562069c7be26300873e7 Mon Sep 17 00:00:00 2001
From: cketti <cketti@gmail.com>
Date: Sat, 25 Feb 2012 00:43:09 +0100
Subject: [PATCH] Allow message header to scroll when displaying the attachment
 list

---
 res/layout/message.xml                      | 1 +
 src/com/fsck/k9/view/SingleMessageView.java | 6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/res/layout/message.xml b/res/layout/message.xml
index 361c90299..ea40b49cb 100644
--- a/res/layout/message.xml
+++ b/res/layout/message.xml
@@ -37,6 +37,7 @@
         android:layout_weight="1">
 
         <LinearLayout
+            android:id="@+id/inside_attachments_container"
             android:orientation="vertical"
             android:layout_width="fill_parent"
             android:layout_height="wrap_content">
diff --git a/src/com/fsck/k9/view/SingleMessageView.java b/src/com/fsck/k9/view/SingleMessageView.java
index 86809718c..f9b2255ad 100644
--- a/src/com/fsck/k9/view/SingleMessageView.java
+++ b/src/com/fsck/k9/view/SingleMessageView.java
@@ -54,6 +54,7 @@ public class SingleMessageView extends LinearLayout implements OnClickListener {
     private LinearLayout mHeaderPlaceHolder;
     private LinearLayout mTitleBarHeaderContainer;
     private View mAttachmentsContainer;
+    private LinearLayout mInsideAttachmentsContainer;
     private SavedState mSavedState;
 
     public void initialize(Activity activity) {
@@ -66,6 +67,7 @@ public class SingleMessageView extends LinearLayout implements OnClickListener {
         mHeaderContainer = (MessageHeader) findViewById(R.id.header_container);
 
         mAttachmentsContainer = findViewById(R.id.attachments_container);
+        mInsideAttachmentsContainer = (LinearLayout) findViewById(R.id.inside_attachments_container);
         mAttachments = (LinearLayout) findViewById(R.id.attachments);
         mHiddenAttachments = (LinearLayout) findViewById(R.id.hidden_attachments);
         mHiddenAttachments.setVisibility(View.GONE);
@@ -463,13 +465,13 @@ public class SingleMessageView extends LinearLayout implements OnClickListener {
     private void moveHeaderToLayout() {
         if (mTitleBarHeaderContainer != null && mTitleBarHeaderContainer.getChildCount() != 0) {
             mTitleBarHeaderContainer.removeView(mHeaderContainer);
-            mHeaderPlaceHolder.addView(mHeaderContainer);
+            mInsideAttachmentsContainer.addView(mHeaderContainer, 0);
         }
     }
 
     private void moveHeaderToWebViewTitleBar() {
         if (mTitleBarHeaderContainer != null && mTitleBarHeaderContainer.getChildCount() == 0) {
-            mHeaderPlaceHolder.removeView(mHeaderContainer);
+            mInsideAttachmentsContainer.removeView(mHeaderContainer);
             mTitleBarHeaderContainer.addView(mHeaderContainer);
         }
     }