From 9d5704c0f5487694288647b98ce1f4d9447363d1 Mon Sep 17 00:00:00 2001
From: Jesse Vincent <jesse@fsck.com>
Date: Mon, 10 Jan 2011 17:47:28 +0000
Subject: [PATCH] Split the Header view out from the MessageView activity

---
 res/layout/message_view_body.xml          |  95 ++++++
 res/layout/message_view_header.xml        | 100 +-----
 src/com/fsck/k9/activity/MessageView.java | 391 ++++------------------
 src/com/fsck/k9/view/MessageHeader.java   | 353 +++++++++++++++++++
 4 files changed, 515 insertions(+), 424 deletions(-)
 create mode 100644 src/com/fsck/k9/view/MessageHeader.java

diff --git a/res/layout/message_view_body.xml b/res/layout/message_view_body.xml
index 701177cd7..ea9e1ae8d 100644
--- a/res/layout/message_view_body.xml
+++ b/res/layout/message_view_body.xml
@@ -1,5 +1,99 @@
 <?xml version="1.0" encoding="utf-8"?>
+<merge
+        xmlns:android="http://schemas.android.com/apk/res/android"
+    >
     <LinearLayout
+        android:id="@+id/show_pictures_section"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="6dip"
+        android:paddingLeft="6dip"
+        android:paddingRight="3dip"
+        android:paddingTop="4dip"
+        android:paddingBottom="4dip"
+        android:baselineAligned="false"
+        android:visibility="gone">
+        <TextView
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textColor="?android:attr/textColorSecondary"
+            android:text="@string/message_view_show_pictures_instructions"
+            android:layout_gravity="center"
+            android:layout_width="0dip"
+            android:layout_height="wrap_content"
+            android:layout_weight="1.0" />
+     <Button android:id="@+id/show_pictures"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/message_view_show_pictures_action" />
+    </LinearLayout>
+    <LinearLayout
+        android:id="@+id/layout_decrypt"
+        android:orientation="horizontal"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:visibility="gone">
+
+        <LinearLayout
+            android:id="@+id/crypto_signature"
+            android:orientation="horizontal"
+            android:layout_height="wrap_content"
+            android:layout_width="0dip"
+            android:layout_weight="2"
+            android:gravity="center_vertical">
+
+            <RelativeLayout
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content">
+
+                <ImageView
+                    android:id="@+id/ic_crypto_signature"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/signed_large"/>
+
+                <ImageView
+                    android:id="@+id/ic_crypto_signature_status"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/overlay_error"/>
+
+            </RelativeLayout>
+
+            <LinearLayout
+                android:orientation="vertical"
+                android:layout_height="wrap_content"
+                android:layout_width="wrap_content"
+                android:paddingLeft="5dip">
+
+                <TextView
+                    android:id="@+id/userId"
+                    android:textAppearance="?android:attr/textAppearanceMedium"
+                    android:ellipsize="end"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="left"/>
+
+                <TextView
+                    android:id="@+id/userIdRest"
+                    android:textAppearance="?android:attr/textAppearanceSmall"
+                    android:ellipsize="end"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="left"/>
+
+            </LinearLayout>
+
+        </LinearLayout>
+
+        <Button
+            android:text="@string/btn_decrypt"
+            android:id="@+id/btn_decrypt"
+            android:layout_width="0dip"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"/>
+
+    </LinearLayout>
+<LinearLayout
         xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/body_container"
         android:layout_width="fill_parent"
@@ -27,3 +121,4 @@
         android:visibility="gone"
         android:layout_width="fill_parent" />
 </LinearLayout>
+</merge>
diff --git a/res/layout/message_view_header.xml b/res/layout/message_view_header.xml
index ed9a59afd..0f52b6ee2 100644
--- a/res/layout/message_view_header.xml
+++ b/res/layout/message_view_header.xml
@@ -1,9 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<merge
-        xmlns:android="http://schemas.android.com/apk/res/android"
-    >
-    <LinearLayout
+    <com.fsck.k9.view.MessageHeader
         android:id="@+id/header_container"
+        xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         >
@@ -156,96 +154,4 @@
            </LinearLayout>
             </LinearLayout>
         </LinearLayout>
-    </LinearLayout>
-    <LinearLayout
-        android:id="@+id/show_pictures_section"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="6dip"
-        android:paddingLeft="6dip"
-        android:paddingRight="3dip"
-        android:paddingTop="4dip"
-        android:paddingBottom="4dip"
-        android:baselineAligned="false"
-        android:visibility="gone">
-        <TextView
-            android:textAppearance="?android:attr/textAppearanceSmall"
-            android:textColor="?android:attr/textColorSecondary"
-            android:text="@string/message_view_show_pictures_instructions"
-            android:layout_gravity="center"
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="1.0" />
-     <Button android:id="@+id/show_pictures"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="@string/message_view_show_pictures_action" />
-    </LinearLayout>
-    <LinearLayout
-        android:id="@+id/layout_decrypt"
-        android:orientation="horizontal"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:visibility="gone">
-
-        <LinearLayout
-            android:id="@+id/crypto_signature"
-            android:orientation="horizontal"
-            android:layout_height="wrap_content"
-            android:layout_width="0dip"
-            android:layout_weight="2"
-            android:gravity="center_vertical">
-
-            <RelativeLayout
-                android:layout_height="wrap_content"
-                android:layout_width="wrap_content">
-
-                <ImageView
-                    android:id="@+id/ic_crypto_signature"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:src="@drawable/signed_large"/>
-
-                <ImageView
-                    android:id="@+id/ic_crypto_signature_status"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:src="@drawable/overlay_error"/>
-
-            </RelativeLayout>
-
-            <LinearLayout
-                android:orientation="vertical"
-                android:layout_height="wrap_content"
-                android:layout_width="wrap_content"
-                android:paddingLeft="5dip">
-
-                <TextView
-                    android:id="@+id/userId"
-                    android:textAppearance="?android:attr/textAppearanceMedium"
-                    android:ellipsize="end"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="left"/>
-
-                <TextView
-                    android:id="@+id/userIdRest"
-                    android:textAppearance="?android:attr/textAppearanceSmall"
-                    android:ellipsize="end"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_gravity="left"/>
-
-            </LinearLayout>
-
-        </LinearLayout>
-
-        <Button
-            android:text="@string/btn_decrypt"
-            android:id="@+id/btn_decrypt"
-            android:layout_width="0dip"
-            android:layout_height="wrap_content"
-            android:layout_weight="1"/>
-
-    </LinearLayout>
-    </merge>
+    </com.fsck.k9.view.MessageHeader>
diff --git a/src/com/fsck/k9/activity/MessageView.java b/src/com/fsck/k9/activity/MessageView.java
index 821ac6e1f..b28a028ef 100644
--- a/src/com/fsck/k9/activity/MessageView.java
+++ b/src/com/fsck/k9/activity/MessageView.java
@@ -9,18 +9,12 @@ import android.content.Intent;
 import android.content.pm.ResolveInfo;
 import android.content.res.Configuration;
 import android.database.Cursor;
-import android.graphics.Typeface;
-import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Environment;
 import android.os.Handler;
-import android.text.SpannableString;
-import android.text.SpannableStringBuilder;
-import android.text.style.StyleSpan;
 import android.util.Config;
 import android.util.Log;
-import android.util.TypedValue;
 import android.view.*;
 import android.view.View.OnClickListener;
 import android.widget.*;
@@ -32,7 +26,6 @@ import com.fsck.k9.crypto.PgpData;
 import com.fsck.k9.helper.Contacts;
 import com.fsck.k9.helper.Utility;
 import com.fsck.k9.mail.*;
-import com.fsck.k9.mail.Message.RecipientType;
 import com.fsck.k9.mail.internet.MimeUtility;
 import com.fsck.k9.mail.store.LocalStore.LocalAttachmentBodyPart;
 import com.fsck.k9.mail.store.LocalStore.LocalMessage;
@@ -41,6 +34,7 @@ import com.fsck.k9.view.AccessibleWebView;
 import com.fsck.k9.view.AttachmentView;
 import com.fsck.k9.view.MessageWebView;
 import com.fsck.k9.view.ToggleScrollView;
+import com.fsck.k9.view.MessageHeader;
 
 import java.io.Serializable;
 import java.util.*;
@@ -54,15 +48,6 @@ public class MessageView extends K9Activity implements OnClickListener
     private static final String STATE_PGP_DATA = "pgpData";
     private static final int ACTIVITY_CHOOSE_FOLDER_MOVE = 1;
     private static final int ACTIVITY_CHOOSE_FOLDER_COPY = 2;
-    private TextView mFromView;
-    private TextView mDateView;
-    private TextView mTimeView;
-    private TextView mToView;
-    private TextView mCcView;
-    private TextView mSubjectView;
-    public View chip;
-    private CheckBox mFlagged;
-    private int defaultSubjectColor;
     private View mDecryptLayout;
     private Button mDecryptButton;
     private LinearLayout mCryptoSignatureLayout = null;
@@ -72,16 +57,11 @@ public class MessageView extends K9Activity implements OnClickListener
     private MessageWebView mMessageContentView;
     private boolean mScreenReaderEnabled;
     private AccessibleWebView mAccessibleMessageContentView;
-    private LinearLayout mHeaderContainer;
-    private LinearLayout mAttachments;
-    private LinearLayout mToContainerView;
-    private LinearLayout mCcContainerView;
-    private TextView mAdditionalHeadersView;
-    private View mAttachmentIcon;
+    private MessageHeader mHeaderContainer;
+    private LinearLayout        mAttachments;
     private View mShowPicturesSection;
     private boolean mShowPictures;
     private Button mDownloadRemainder;
-    private static Drawable answeredIcon;
     View next;
     View previous;
     private View mDelete;
@@ -130,21 +110,6 @@ public class MessageView extends K9Activity implements OnClickListener
         public void onMount(String providerId) {} // no-op
     }
 
-    /**
-     * Pair class is only available since API Level 5, so we need
-     * this helper class unfortunately
-     */
-    private static class HeaderEntry
-    {
-        public String label;
-        public String value;
-
-        public HeaderEntry(String label, String value)
-        {
-            this.label = label;
-            this.value = value;
-        }
-    }
 
     @Override
     public boolean dispatchTouchEvent(MotionEvent ev)
@@ -331,6 +296,44 @@ public class MessageView extends K9Activity implements OnClickListener
 
     class MessageViewHandler extends Handler
     {
+        public void setHeaders (final Message message)
+        {
+            runOnUiThread(new Runnable()
+            {
+                public void run()
+                {
+                    try
+                    {
+                        mHeaderContainer.populate( message,mAccount);
+                        mHeaderContainer.setOnFlagListener( new OnClickListener()
+                        {
+                            @Override public void onClick(View v)
+                            {
+                                if (mMessage != null)
+                                {
+                                    onFlag();
+                                }
+                            }
+                        });
+                    }
+                    catch (Exception me)
+                    {
+                        Log.e(K9.LOG_TAG, "setHeaders - error", me);
+                    }
+                    if (mMessage.isSet(Flag.X_DOWNLOADED_FULL))
+                    {
+                        mDownloadRemainder.setVisibility(View.GONE);
+                    }
+                    else
+                    {
+                        mDownloadRemainder.setEnabled(true);
+                        mDownloadRemainder.setVisibility(View.VISIBLE);
+                    }
+                }
+            });
+
+        }
+
         public void progress(final boolean progress)
         {
             runOnUiThread(new Runnable()
@@ -384,74 +387,7 @@ public class MessageView extends K9Activity implements OnClickListener
             });
         }
 
-        public void setHeaders(
-            final Message message) throws MessagingException
-        {
-            final Contacts contacts = K9.showContactName() ? mContacts : null;
-            final CharSequence from = Address.toFriendly(message.getFrom(), contacts);
-            final String date = getDateFormat().format(message.getSentDate());
-            final String time = getTimeFormat().format(message.getSentDate());
-            final CharSequence to = Address.toFriendly(message.getRecipients(RecipientType.TO), contacts);
-            final CharSequence cc = Address.toFriendly(message.getRecipients(RecipientType.CC), contacts);
-            runOnUiThread(new Runnable()
-            {
-                public void run()
-                {
-                    String subject = message.getSubject();
-                    setTitle(subject);
-                    if (subject == null || subject.equals(""))
-                    {
-                        mSubjectView.setText(getText(R.string.general_no_subject));
-                    }
-                    else
-                    {
-                        mSubjectView.setText(subject);
-                    }
-                    mFromView.setText(from);
-                    if (date != null)
-                    {
-                        mDateView.setText(date);
-                        mDateView.setVisibility(View.VISIBLE);
-                    }
-                    else
-                    {
-                        mDateView.setVisibility(View.GONE);
-                    }
-                    mTimeView.setText(time);
-                    mToContainerView.setVisibility((to != null && to.length() > 0) ? View.VISIBLE : View.GONE);
-                    mToView.setText(to);
-                    mCcContainerView.setVisibility((cc != null && cc.length() > 0) ? View.VISIBLE : View.GONE);
-                    mCcView.setText(cc);
-                    mAttachmentIcon.setVisibility(((LocalMessage) message).hasAttachments() ? View.VISIBLE : View.GONE);
-                    mFlagged.setChecked(message.isSet(Flag.FLAGGED));
-                    mSubjectView.setTextColor(0xff000000 | defaultSubjectColor);
-                    chip.setBackgroundDrawable(mAccount.generateColorChip().drawable());
-                    chip.getBackground().setAlpha(!message.isSet(Flag.SEEN) ? 255 : 127);
-                    if (message.isSet(Flag.ANSWERED))
-                    {
-                        mSubjectView.setCompoundDrawablesWithIntrinsicBounds(answeredIcon, null, null, null);
-                    }
-                    else
-                    {
-                        mSubjectView.setCompoundDrawablesWithIntrinsicBounds(null, null, null, null);
-                    }
-                    if (mMessage.isSet(Flag.X_DOWNLOADED_FULL))
-                    {
-                        mDownloadRemainder.setVisibility(View.GONE);
-                    }
-                    else
-                    {
-                        mDownloadRemainder.setEnabled(true);
-                        mDownloadRemainder.setVisibility(View.VISIBLE);
-                    }
-                    mHeaderContainer.setVisibility(View.VISIBLE);
-                    if (mAdditionalHeadersView.getVisibility() == View.VISIBLE)
-                    {
-                        showAdditionalHeaders();
-                    }
-                }
-            });
-        }
+
 
         public void networkError()
         {
@@ -502,127 +438,8 @@ public class MessageView extends K9Activity implements OnClickListener
             });
         }
 
-        private void hideHeaderContainer()
-        {
-            {
-                runOnUiThread(new Runnable()
-                {
-                    public void run()
-                    {
-                        mHeaderContainer.setVisibility(View.GONE);
-                    }
-                });
-            }
-        }
-
-        /**
-         * Clear the text field for the additional headers display if they are
-         * not shown, to save UI resources.
-         */
-        public void hideAdditionalHeaders()
-        {
-            runOnUiThread(new Runnable()
-            {
-                public void run()
-                {
-                    mAdditionalHeadersView.setVisibility(View.GONE);
-                    mAdditionalHeadersView.setText("");
-                    mTopView.scrollTo(0, 0);
-                }
-            });
-        }
-
-        /**
-         * Set up and then show the additional headers view. Called by
-         * {@link #onShowAdditionalHeaders()}
-         * (when switching between messages).
-         */
-        public void showAdditionalHeaders()
-        {
-            runOnUiThread(new Runnable()
-            {
-                public void run()
-                {
-                    Integer messageToShow = null;
-                    try
-                    {
-                        // Retrieve additional headers
-                        boolean allHeadersDownloaded = mMessage.isSet(Flag.X_GOT_ALL_HEADERS);
-                        List<HeaderEntry> additionalHeaders = getAdditionalHeaders(mMessage);
-                        if (!additionalHeaders.isEmpty())
-                        {
-                            // Show the additional headers that we have got.
-                            setupAdditionalHeadersView(additionalHeaders);
-                            mAdditionalHeadersView.setVisibility(View.VISIBLE);
-                        }
-                        if (!allHeadersDownloaded)
-                        {
-                            /*
-                             * Tell the user about the "save all headers" setting
-                             *
-                             * NOTE: This is only a temporary solution... in fact,
-                             * the system should download headers on-demand when they
-                             * have not been saved in their entirety initially.
-                             */
-                            messageToShow = R.string.message_additional_headers_not_downloaded;
-                        }
-                        else if (additionalHeaders.isEmpty())
-                        {
-                            // All headers have been downloaded, but there are no additional headers.
-                            messageToShow = R.string.message_no_additional_headers_available;
-                        }
-                    }
-                    catch (MessagingException e)
-                    {
-                        messageToShow = R.string.message_additional_headers_retrieval_failed;
-                    }
-                    // Show a message to the user, if any
-                    if (messageToShow != null)
-                    {
-                        Toast toast = Toast.makeText(MessageView.this, messageToShow, Toast.LENGTH_LONG);
-                        toast.setGravity(Gravity.CENTER_VERTICAL | Gravity.CENTER_HORIZONTAL, 0, 0);
-                        toast.show();
-                    }
-                }
-            });
-        }
-
-        /**
-         * Set up the additional headers text view with the supplied header data.
-         *
-         * @param additionalHeaders
-         *          List of header entries. Each entry consists of a header
-         *          name and a header value. Header names may appear multiple
-         *          times.
-         *
-         * This method is always called from within the UI thread by
-         * {@link #showAdditionalHeaders()}.
-         */
-        private void setupAdditionalHeadersView(final List<HeaderEntry> additionalHeaders)
-        {
-            SpannableStringBuilder sb = new SpannableStringBuilder();
-            boolean first = true;
-            for (HeaderEntry additionalHeader : additionalHeaders)
-            {
-                if (!first)
-                {
-                    sb.append("\n");
-                }
-                else
-                {
-                    first = false;
-                }
-                StyleSpan boldSpan = new StyleSpan(Typeface.BOLD);
-                SpannableString label = new SpannableString(additionalHeader.label + ": ");
-                label.setSpan(boldSpan, 0, label.length(), 0);
-                sb.append(label);
-                sb.append(MimeUtility.unfoldAndDecode(additionalHeader.value));
-            }
-            mAdditionalHeadersView.setText(sb);
-        }
     }
 
-
     public static void actionView(Context context, MessageReference messRef, List<MessageReference> messReferences)
     {
         actionView(context, messRef, messReferences, null);
@@ -650,8 +467,11 @@ public class MessageView extends K9Activity implements OnClickListener
         setContentView(R.layout.message_view);
         mMessageContentView = (MessageWebView) findViewById(R.id.message_content);
         mAccessibleMessageContentView = (AccessibleWebView) findViewById(R.id.accessible_message_content);
+        mAttachments = (LinearLayout) findViewById(R.id.attachments);
+
+        mHeaderContainer = (MessageHeader) findViewById(R.id.header_container);
+
         mScreenReaderEnabled = isScreenReaderActive();
-        answeredIcon = getResources().getDrawable(R.drawable.ic_mms_answered_small);
         if (mScreenReaderEnabled)
         {
             mAccessibleMessageContentView.setVisibility(View.VISIBLE);
@@ -807,47 +627,19 @@ public class MessageView extends K9Activity implements OnClickListener
 
     private void setupHeaderLayout()
     {
-        mAttachments = (LinearLayout) findViewById(R.id.attachments);
-        mAttachmentIcon = findViewById(R.id.attachment);
         mShowPicturesSection = findViewById(R.id.show_pictures_section);
         mShowPictures = false;
+
         mDownloadRemainder = (Button) findViewById(R.id.download_remainder);
         mMessageContentView.configure();
-        mHeaderContainer = (LinearLayout) findViewById(R.id.header_container);
-        mFromView = (TextView) findViewById(R.id.from);
-        mToView = (TextView) findViewById(R.id.to);
-        mCcView = (TextView) findViewById(R.id.cc);
-        mToContainerView = (LinearLayout) findViewById(R.id.to_container);
-        mCcContainerView = (LinearLayout) findViewById(R.id.cc_container);
-        mSubjectView = (TextView) findViewById(R.id.subject);
-        defaultSubjectColor = mSubjectView.getCurrentTextColor();
-        mAdditionalHeadersView = (TextView) findViewById(R.id.additional_headers_view);
-        chip = findViewById(R.id.chip);
-        mDateView = (TextView) findViewById(R.id.date);
-        mTimeView = (TextView) findViewById(R.id.time);
+
         mTopView = mToggleScrollView = (ToggleScrollView) findViewById(R.id.top_view);
-        mFlagged = (CheckBox) findViewById(R.id.flagged);
-        mFlagged.setOnClickListener(new OnClickListener()
-        {
-            public void onClick(View v)
-            {
-                onFlag();
-            }
-        });
-        mFromView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, mFontSizes.getMessageViewSender());
-        mToView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, mFontSizes.getMessageViewTo());
-        ((TextView) findViewById(R.id.to_label)).setTextSize(TypedValue.COMPLEX_UNIT_DIP, mFontSizes.getMessageViewTo());
-        mCcView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, mFontSizes.getMessageViewCC());
-        ((TextView) findViewById(R.id.cc_label)).setTextSize(TypedValue.COMPLEX_UNIT_DIP, mFontSizes.getMessageViewCC());
-        mSubjectView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, mFontSizes.getMessageViewSubject());
-        mTimeView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, mFontSizes.getMessageViewTime());
-        mDateView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, mFontSizes.getMessageViewDate());
-        mAdditionalHeadersView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, mFontSizes.getMessageViewAdditionalHeaders());
-        mAdditionalHeadersView.setVisibility(View.GONE);
+
         mAttachments.setVisibility(View.GONE);
-        mAttachmentIcon.setVisibility(View.GONE);
+
     }
 
+
     private void setupDecryptLayout()
     {
         mDecryptLayout = (View) findViewById(R.id.layout_decrypt);
@@ -948,7 +740,8 @@ public class MessageView extends K9Activity implements OnClickListener
         mTopView.setVisibility(View.GONE);
         mTopView.scrollTo(0, 0);
         mMessageContentView.scrollTo(0, 0);
-        mHandler.hideHeaderContainer();
+        mHeaderContainer.setVisibility(View.GONE);
+
         mMessageContentView.clearView();
         setLoadPictures(false);
         mAttachments.removeAllViews();
@@ -1221,21 +1014,6 @@ public class MessageView extends K9Activity implements OnClickListener
         }
     }
 
-    private void onClickSender()
-    {
-        if (mMessage != null)
-        {
-            try
-            {
-                final Address senderEmail = mMessage.getFrom()[0];
-                mContacts.createContact(this, senderEmail);
-            }
-            catch (Exception e)
-            {
-                Log.e(K9.LOG_TAG, "Couldn't create contact", e);
-            }
-        }
-    }
 
     private void onReply()
     {
@@ -1327,42 +1105,6 @@ public class MessageView extends K9Activity implements OnClickListener
         startActivityForResult(intent, activity);
     }
 
-    private void onShowAdditionalHeaders()
-    {
-        int currentVisibility = mAdditionalHeadersView.getVisibility();
-        if (currentVisibility == View.VISIBLE)
-        {
-            mHandler.hideAdditionalHeaders();
-        }
-        else
-        {
-            mHandler.showAdditionalHeaders();
-        }
-    }
-
-    private List<HeaderEntry> getAdditionalHeaders(final Message message)
-    throws MessagingException
-    {
-        List<HeaderEntry> additionalHeaders = new LinkedList<HeaderEntry>();
-
-        /*
-         * Remove "Subject" header as it is already shown in the standard
-         * message view header. But do show "From", "To", and "Cc" again.
-         * This time including the email addresses. See issue 1805.
-         */
-        Set<String> headerNames = new HashSet<String>(message.getHeaderNames());
-        headerNames.remove("Subject");
-
-        for (String headerName : headerNames)
-        {
-            String[] headerValues = message.getHeader(headerName);
-            for (String headerValue : headerValues)
-            {
-                additionalHeaders.add(new HeaderEntry(headerName, headerValue));
-            }
-        }
-        return additionalHeaders;
-    }
 
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data)
@@ -1461,6 +1203,8 @@ public class MessageView extends K9Activity implements OnClickListener
             {
                 mMessage.setFlag(Flag.SEEN, false);
                 mHandler.setHeaders(mMessage);
+                String subject = mMessage.getSubject();
+                setTitle(subject);
             }
             catch (Exception e)
             {
@@ -1508,9 +1252,6 @@ public class MessageView extends K9Activity implements OnClickListener
     {
         switch (view.getId())
         {
-            case R.id.from:
-                onClickSender();
-                break;
             case R.id.reply:
             case R.id.reply_scrolling:
                 onReply();
@@ -1552,9 +1293,6 @@ public class MessageView extends K9Activity implements OnClickListener
             case R.id.show_pictures:
                 onShowPictures();
                 break;
-            case R.id.header_container:
-                onShowAdditionalHeaders();
-                break;
             case R.id.download_remainder:
                 onDownloadRemainder();
                 break;
@@ -1600,7 +1338,13 @@ public class MessageView extends K9Activity implements OnClickListener
                 onCopy();
                 break;
             case R.id.show_full_header:
-                onShowAdditionalHeaders();
+                runOnUiThread(new Runnable()
+                {
+                    @Override public void run()
+                    {
+                        mHeaderContainer.onShowAdditionalHeaders();
+                    }
+                });
                 break;
             case R.id.select_text:
                 mToggleScrollView.setScrolling(false);
@@ -1679,7 +1423,7 @@ public class MessageView extends K9Activity implements OnClickListener
             MenuItem additionalHeadersItem = menu.findItem(R.id.show_full_header);
             if (additionalHeadersItem != null)
             {
-                additionalHeadersItem.setTitle((mAdditionalHeadersView.getVisibility() == View.VISIBLE) ?
+                additionalHeadersItem.setTitle(mHeaderContainer.additionalHeadersVisible() ?
                                                R.string.hide_full_header_action : R.string.show_full_header_action);
             }
         }
@@ -1831,14 +1575,7 @@ public class MessageView extends K9Activity implements OnClickListener
                     }
                 });
             }
-            try
-            {
-                mHandler.setHeaders(message);
-            }
-            catch (MessagingException me)
-            {
-                Log.e(K9.LOG_TAG, "loadMessageForViewHeadersAvailable", me);
-            }
+            mHandler.setHeaders(message);
         }
 
         @Override
diff --git a/src/com/fsck/k9/view/MessageHeader.java b/src/com/fsck/k9/view/MessageHeader.java
new file mode 100644
index 000000000..ba506c444
--- /dev/null
+++ b/src/com/fsck/k9/view/MessageHeader.java
@@ -0,0 +1,353 @@
+package com.fsck.k9.view;
+
+import android.content.Context;
+import android.graphics.Typeface;
+import android.graphics.drawable.Drawable;
+import android.text.SpannableString;
+import android.text.SpannableStringBuilder;
+import android.text.style.StyleSpan;
+import android.util.Log;
+import android.util.AttributeSet;
+import android.util.TypedValue;
+import android.view.Gravity;
+import android.view.View;
+import android.widget.CheckBox;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+import android.widget.Toast;
+import com.fsck.k9.FontSizes;
+import com.fsck.k9.K9;
+import com.fsck.k9.R;
+import com.fsck.k9.helper.Contacts;
+import com.fsck.k9.Account;
+import com.fsck.k9.helper.DateFormatter;
+import com.fsck.k9.mail.Address;
+import com.fsck.k9.mail.Flag;
+import com.fsck.k9.mail.Message;
+import com.fsck.k9.mail.MessagingException;
+import com.fsck.k9.mail.internet.MimeUtility;
+import com.fsck.k9.mail.store.LocalStore;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Set;
+import java.text.DateFormat;
+public class MessageHeader extends LinearLayout
+{
+    private Context mContext;
+    private TextView mFromView;
+    private TextView mDateView;
+    private TextView mTimeView;
+    private TextView mToView;
+    private TextView mCcView;
+    private TextView mSubjectView;
+    private DateFormat mDateFormat;
+    private DateFormat mTimeFormat;
+
+    private View mChip;
+    private CheckBox mFlagged;
+    private int defaultSubjectColor;
+    private LinearLayout mToContainerView;
+    private LinearLayout mCcContainerView;
+    private TextView mAdditionalHeadersView;
+    private View mAttachmentIcon;
+    private static Drawable answeredIcon;
+    private Message mMessage;
+    private Account mAccount;
+    private FontSizes mFontSizes = K9.getFontSizes();
+    private Contacts mContacts;
+
+    /**
+     * Pair class is only available since API Level 5, so we need
+     * this helper class unfortunately
+     */
+    private static class HeaderEntry
+    {
+        public String label;
+        public String value;
+
+        public HeaderEntry(String label, String value)
+        {
+            this.label = label;
+            this.value = value;
+        }
+    }
+
+    public MessageHeader(Context context, AttributeSet attrs)
+    {
+        super(context, attrs);
+        mContext = context;
+        mDateFormat = DateFormatter.getDateFormat(mContext);
+        mTimeFormat = android.text.format.DateFormat.getTimeFormat(mContext);   // 12/24 date format
+        mContacts = Contacts.getInstance(mContext);
+    }
+
+    private void initializeLayout()
+    {
+        mAttachmentIcon = findViewById(R.id.attachment);
+        mFromView = (TextView) findViewById(R.id.from);
+        mToView = (TextView) findViewById(R.id.to);
+        mCcView = (TextView) findViewById(R.id.cc);
+        mToContainerView = (LinearLayout) findViewById(R.id.to_container);
+        mCcContainerView = (LinearLayout) findViewById(R.id.cc_container);
+        mSubjectView = (TextView) findViewById(R.id.subject);
+        mAdditionalHeadersView = (TextView) findViewById(R.id.additional_headers_view);
+        mChip = findViewById(R.id.chip);
+        mDateView = (TextView) findViewById(R.id.date);
+        mTimeView = (TextView) findViewById(R.id.time);
+        mFlagged = (CheckBox) findViewById(R.id.flagged);
+
+        defaultSubjectColor = mSubjectView.getCurrentTextColor();
+        answeredIcon = getResources().getDrawable(R.drawable.ic_mms_answered_small);
+        mSubjectView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, mFontSizes.getMessageViewSubject());
+        mTimeView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, mFontSizes.getMessageViewTime());
+        mDateView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, mFontSizes.getMessageViewDate());
+        mAdditionalHeadersView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, mFontSizes.getMessageViewAdditionalHeaders());
+        mAdditionalHeadersView.setVisibility(View.GONE);
+        mAttachmentIcon.setVisibility(View.GONE);
+        mFromView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, mFontSizes.getMessageViewSender());
+        mToView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, mFontSizes.getMessageViewTo());
+        mCcView.setTextSize(TypedValue.COMPLEX_UNIT_DIP, mFontSizes.getMessageViewCC());
+        ((TextView) findViewById(R.id.to_label)).setTextSize(TypedValue.COMPLEX_UNIT_DIP, mFontSizes.getMessageViewTo());
+        ((TextView) findViewById(R.id.cc_label)).setTextSize(TypedValue.COMPLEX_UNIT_DIP, mFontSizes.getMessageViewCC());
+
+        setOnClickListener(new OnClickListener()
+        {
+            @Override
+            public void onClick(View v)
+            {
+                onShowAdditionalHeaders();
+                return;
+            }
+        });
+
+        mFromView.setOnClickListener( new OnClickListener()
+        {
+            @Override
+            public void onClick(View v)
+            {
+                if (mMessage != null)
+                {
+                    try
+                    {
+                        final Address senderEmail = mMessage.getFrom()[0];
+                        mContacts.createContact(senderEmail);
+                    }
+                    catch (Exception e)
+                    {
+                        Log.e(K9.LOG_TAG, "Couldn't create contact", e);
+                    }
+                }
+            }
+        });
+    }
+
+    public void setOnFlagListener (OnClickListener listener)
+    {
+        mFlagged.setOnClickListener(listener);
+    }
+
+
+    public boolean additionalHeadersVisible()
+    {
+        if ( mAdditionalHeadersView.getVisibility() == View.VISIBLE )
+        {
+            return true;
+        }
+        else
+        {
+            return false;
+        }
+    }
+
+    /**
+     * Clear the text field for the additional headers display if they are
+     * not shown, to save UI resources.
+     */
+    private void hideAdditionalHeaders()
+    {
+        mAdditionalHeadersView.setVisibility(View.GONE);
+        mAdditionalHeadersView.setText("");
+
+    }
+
+
+    /**
+     * Set up and then show the additional headers view. Called by
+     * {@link #onShowAdditionalHeaders()}
+     * (when switching between messages).
+     */
+    private void showAdditionalHeaders()
+    {
+        Integer messageToShow = null;
+        try
+        {
+            // Retrieve additional headers
+            boolean allHeadersDownloaded = mMessage.isSet(Flag.X_GOT_ALL_HEADERS);
+            List<HeaderEntry> additionalHeaders = getAdditionalHeaders(mMessage);
+            if (!additionalHeaders.isEmpty())
+            {
+                // Show the additional headers that we have got.
+                populateAdditionalHeadersView(additionalHeaders);
+                mAdditionalHeadersView.setVisibility(View.VISIBLE);
+            }
+            if (!allHeadersDownloaded)
+            {
+                /*
+                * Tell the user about the "save all headers" setting
+                *
+                * NOTE: This is only a temporary solution... in fact,
+                * the system should download headers on-demand when they
+                * have not been saved in their entirety initially.
+                */
+                messageToShow = R.string.message_additional_headers_not_downloaded;
+            }
+            else if (additionalHeaders.isEmpty())
+            {
+                // All headers have been downloaded, but there are no additional headers.
+                messageToShow = R.string.message_no_additional_headers_available;
+            }
+        }
+        catch (MessagingException e)
+        {
+            messageToShow = R.string.message_additional_headers_retrieval_failed;
+        }
+        // Show a message to the user, if any
+        if (messageToShow != null)
+        {
+            Toast toast = Toast.makeText(mContext, messageToShow, Toast.LENGTH_LONG);
+            toast.setGravity(Gravity.CENTER_VERTICAL | Gravity.CENTER_HORIZONTAL, 0, 0);
+            toast.show();
+        }
+
+    }
+
+    public void populate( final Message message, final Account account) throws MessagingException
+    {
+        final Contacts contacts = K9.showContactName() ? mContacts : null;
+        final CharSequence from = Address.toFriendly(message.getFrom(), contacts);
+        final String date = mDateFormat.format(message.getSentDate());
+        final String time = mTimeFormat.format(message.getSentDate());
+        final CharSequence to = Address.toFriendly(message.getRecipients(Message.RecipientType.TO), contacts);
+        final CharSequence cc = Address.toFriendly(message.getRecipients(Message.RecipientType.CC), contacts);
+
+        mMessage = message;
+        mAccount = account;
+
+        initializeLayout();
+        String subject = message.getSubject();
+        if (subject == null || subject.equals(""))
+        {
+            mSubjectView.setText(mContext.getText(R.string.general_no_subject));
+        }
+        else
+        {
+            mSubjectView.setText(subject);
+        }
+        mSubjectView.setTextColor(0xff000000 | defaultSubjectColor);
+
+        mFromView.setText(from);
+
+        if (date != null)
+        {
+            mDateView.setText(date);
+            mDateView.setVisibility(View.VISIBLE);
+        }
+        else
+        {
+            mDateView.setVisibility(View.GONE);
+        }
+        mTimeView.setText(time);
+        mToContainerView.setVisibility((to != null && to.length() > 0) ? View.VISIBLE : View.GONE);
+        mToView.setText(to);
+        mCcContainerView.setVisibility((cc != null && cc.length() > 0) ? View.VISIBLE : View.GONE);
+        mCcView.setText(cc);
+        mAttachmentIcon.setVisibility(((LocalStore.LocalMessage) message).hasAttachments() ? View.VISIBLE : View.GONE);
+        mFlagged.setChecked(message.isSet(Flag.FLAGGED));
+        mChip.setBackgroundDrawable(mAccount.generateColorChip().drawable());
+        mChip.getBackground().setAlpha(!message.isSet(Flag.SEEN) ? 255 : 127);
+
+        if (message.isSet(Flag.ANSWERED))
+        {
+            mSubjectView.setCompoundDrawablesWithIntrinsicBounds(answeredIcon, null, null, null);
+        }
+        else
+        {
+            mSubjectView.setCompoundDrawablesWithIntrinsicBounds(null, null, null, null);
+        }
+        setVisibility(View.VISIBLE);
+        if (mAdditionalHeadersView.getVisibility() == View.VISIBLE)
+        {
+            showAdditionalHeaders();
+        }
+    }
+
+    public void onShowAdditionalHeaders()
+    {
+        int currentVisibility = mAdditionalHeadersView.getVisibility();
+        if (currentVisibility == View.VISIBLE)
+        {
+            hideAdditionalHeaders();
+        }
+        else
+        {
+            showAdditionalHeaders();
+        }
+    }
+
+    private List<HeaderEntry> getAdditionalHeaders(final Message message)
+    throws MessagingException
+    {
+        List<HeaderEntry> additionalHeaders = new LinkedList<HeaderEntry>();
+        /*
+        * Remove "Subject" header as it is already shown in the standard
+        * message view header. But do show "From", "To", and "Cc" again.
+        * This time including the email addresses. See issue 1805.
+        */
+        Set<String> headerNames = new HashSet<String>(message.getHeaderNames());
+        headerNames.remove("Subject");
+        for (String headerName : headerNames)
+        {
+            String[] headerValues = message.getHeader(headerName);
+            for (String headerValue : headerValues)
+            {
+                additionalHeaders.add(new HeaderEntry(headerName, headerValue));
+            }
+        }
+        return additionalHeaders;
+    }
+
+    /**
+     * Set up the additional headers text view with the supplied header data.
+     *
+     * @param additionalHeaders List of header entries. Each entry consists of a header
+     *                          name and a header value. Header names may appear multiple
+     *                          times.
+     *                          <p/>
+     *                          This method is always called from within the UI thread by
+     *                          {@link #showAdditionalHeaders()}.
+     */
+    private void populateAdditionalHeadersView(final List<HeaderEntry> additionalHeaders)
+    {
+        SpannableStringBuilder sb = new SpannableStringBuilder();
+        boolean first = true;
+        for (HeaderEntry additionalHeader : additionalHeaders)
+        {
+            if (!first)
+            {
+                sb.append("\n");
+            }
+            else
+            {
+                first = false;
+            }
+            StyleSpan boldSpan = new StyleSpan(Typeface.BOLD);
+            SpannableString label = new SpannableString(additionalHeader.label + ": ");
+            label.setSpan(boldSpan, 0, label.length(), 0);
+            sb.append(label);
+            sb.append(MimeUtility.unfoldAndDecode(additionalHeader.value));
+        }
+        mAdditionalHeadersView.setText(sb);
+    }
+
+}