From a826d3fb03f29a07ea12e44237b2c02ea1926c74 Mon Sep 17 00:00:00 2001
From: Makoto Onuki <omakoto@google.com>
Date: Mon, 10 Jan 2011 13:35:47 -0800
Subject: [PATCH] Pixel perfect: Message view

Still waiting for a few missing assets, but it's done other than that.

The divider change is already merged; new layouts all use the framework style.

It's basically all layout changes, except for:
- Now the recepient address line has "Show details", which shows a dialog with
  all to/cc/bcc addresses with the timestamp.
- Now invite response buttons are checkboxes.
  (But the basic behavior doesn't change -- once you check a response,
  the message will be gone, so you can't change the response later.)

Copied message_header_bg from gmail manuall.  It'll look silly without it.

Bug 3138021
Bug 3307021

Change-Id: I6f7eb91d6104c3143a5c58b0c4c6c19929cea477
---
 res/drawable-hdpi/message_header_bg.png       | Bin 0 -> 25020 bytes
 res/drawable-hdpi/presence_inactive.png       | Bin 1007 -> 0 bytes
 res/drawable-mdpi/message_header_bg.png       | Bin 0 -> 3412 bytes
 res/drawable-mdpi/presence_inactive.png       | Bin 3411 -> 0 bytes
 res/layout-xlarge/message_view_attachment.xml | 172 +++++++
 res/layout-xlarge/message_view_fragment.xml   | 433 +++++++++---------
 res/layout-xlarge/message_view_invitation.xml | 139 ++++++
 res/layout/message_view_attachment.xml        |   6 +-
 res/layout/message_view_details.xml           |  98 ++++
 res/layout/message_view_fragment.xml          |  78 +---
 res/layout/message_view_invitation.xml        |   8 +-
 res/values/colors.xml                         |   3 +
 res/values/strings.xml                        |   8 +
 src/com/android/email/Utility.java            |  20 +-
 .../email/activity/ContactStatusLoader.java   |   3 +-
 .../email/activity/MessageViewFragment.java   |  59 ++-
 .../activity/MessageViewFragmentBase.java     |  99 ++--
 .../MessageViewMessageDetailsDialog.java      |  91 ++++
 src/com/android/email/mail/Address.java       |  38 +-
 .../com/android/email/UtilityUnitTests.java   |  12 +
 .../android/email/mail/AddressUnitTests.java  | 181 ++++----
 21 files changed, 996 insertions(+), 452 deletions(-)
 create mode 100644 res/drawable-hdpi/message_header_bg.png
 delete mode 100644 res/drawable-hdpi/presence_inactive.png
 create mode 100644 res/drawable-mdpi/message_header_bg.png
 delete mode 100755 res/drawable-mdpi/presence_inactive.png
 create mode 100644 res/layout-xlarge/message_view_attachment.xml
 create mode 100644 res/layout-xlarge/message_view_invitation.xml
 create mode 100644 res/layout/message_view_details.xml
 create mode 100644 src/com/android/email/activity/MessageViewMessageDetailsDialog.java

diff --git a/res/drawable-hdpi/message_header_bg.png b/res/drawable-hdpi/message_header_bg.png
new file mode 100644
index 0000000000000000000000000000000000000000..9306813e3d44af08da7db80dcdd300691e357499
GIT binary patch
literal 25020
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
WhvJalCXeIh966|^{^XZam;MinFvyAk

literal 0
HcmV?d00001

diff --git a/res/drawable-hdpi/presence_inactive.png b/res/drawable-hdpi/presence_inactive.png
deleted file mode 100644
index d96d351da4d21502e2c0eb8f5f53b56c0b0fac6e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1007
zcmV<L0}%X)P)<h;3K|Lk000e1NJLTq000{R000{Z1^@s6jnwp20000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU#kx4{BRCwB~mf23*Koo|@&b~TZL&?&r
zi>NB0N?amwS)PE$u2imQMb$<S2-)|B#Bpr*|IIjZ!xkVT9oZh+=bN+6D5KFxxWh0E
zN3O50#b7XSq}S_->2xYg({#k=^9e;!L?93l!C+7v9UX~vhvLFqP`BF^olZxz+ilVB
z_c^EH^%kV4s%i?b5I`XSr?^f5?EC%xMl>32A08fBkHTC~v)L52T1~WCEn27G{X57m
zAfa$LY(lX`fnt-^aoDzfqexNoP$+bY?=JWE_w74jw8RBft5wlxH256Fy8}on7K<%3
zO*7Kzv=NWTO;}+=p<}^fu~57MH**DJy#Kzpw>P^5qjCbz&(Foh#RcP%A&BnEX0v)e
zpPvKf!(0}UfF%LTvVyR74lw{9VnJ>EH^(BC*=$C)&jCE%+1VNY2dh*n;_U3qu?nt>
zVeTtH!9t-hEf$M9l$EjS9OmqY;(_lvSX_no&_kesn0_mjO1k@v%8X+&$PW%&P`O+-
z5Qh)zfTT-v$lOn`$c86O#MKAb?sz;_mM~_X%t$7KM%U3Ixa&P6xemxvI@;CM)n`C#
zz?evkeQ^ns*~pmeG8q^n0Nw(WcnZh^OxEl5kDjR#tWzD>WHJ%5hJwtxWHRYzk~|0G
z4kSqqjUXZ)1CWdZgRgllu#TACxPSE$kUQY9Ezjc(3~4N2RXP%hn5-kFx7fhYbzSp3
zIyzNZ{ZUlE#bRX*Z34EU$GP{zDh0x(YOy=86Kn#81oL^zP}ZU!^S0CLWWTdqi(fLJ
z%k-9^<3_lS+s4#ws*uGdEMq(KJUaI(Vnr8r2x4D@rGrhtpmXSX{OiD2<gl#ic5!56
za}zMstXEIZfnidhbJSV<NLQAE4tVz^Ab6{TQkuF=1>)#aQ>heT+^0@y8MldCF82rh
zZS))v|3f4H?U}kvBofxrG78*x!Hth`lfYm2ar{KkaC>|E)HB6iSX(9y4=$NZhSph-
zWAsG>eNBZcP3%P{aLHOOMOJt4{ZIbqao-87vTvP1c%q`fl^PcC1r3?WW68!E9u9~3
z`FyUiGe82|rJ3H$I(Vi9*lZ=$e*iRo@N`AtLb>q)7I{Y4CekAP-lLrN?C8D&@HMV)
z+}`%cpfy!U!|OV++Ot-Iylig}mP7-RmIt1=1P7(^xhz=5wSOPvUf5kdRTgFMu9pC;
d?caX_3;^L@?Ic9%JbC~C002ovPDHLkV1gHC;D!JI

diff --git a/res/drawable-mdpi/message_header_bg.png b/res/drawable-mdpi/message_header_bg.png
new file mode 100644
index 0000000000000000000000000000000000000000..9a161844e24bc2ead1873fa48b4a0cc3e43ab0f2
GIT binary patch
literal 3412
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

literal 0
HcmV?d00001

diff --git a/res/drawable-mdpi/presence_inactive.png b/res/drawable-mdpi/presence_inactive.png
deleted file mode 100755
index 4b07247cdace9186d81b31a5f3b8300a3e85ec3a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3411
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

diff --git a/res/layout-xlarge/message_view_attachment.xml b/res/layout-xlarge/message_view_attachment.xml
new file mode 100644
index 000000000..e47b350d2
--- /dev/null
+++ b/res/layout-xlarge/message_view_attachment.xml
@@ -0,0 +1,172 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- xlarge -->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="64dip"
+    android:orientation="horizontal"
+    >
+    <!-- STOPSHIP default icon is not final -->
+    <ImageView
+        android:id="@+id/attachment_icon"
+        android:layout_width="64dip"
+        android:layout_height="match_parent"
+        android:layout_weight="0"
+        android:src="@drawable/attached_image_placeholder"
+        android:scaleType="fitCenter"
+        />
+    <LinearLayout
+        android:layout_width="0dip"
+        android:layout_height="match_parent"
+        android:layout_weight="1"
+        android:orientation="horizontal"
+        android:divider="?android:attr/dividerVertical"
+        android:showDividers="middle"
+        android:dividerPadding="16dip"
+        >
+        <RelativeLayout
+            android:layout_width="0dip"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:layout_marginLeft="32dip"
+            android:layout_marginRight="16dip"
+            >
+            <ProgressBar
+                android:id="@+id/progress"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_alignParentBottom="true"
+                android:layout_alignParentLeft="true"
+                android:layout_alignParentRight="true"
+                style="?android:attr/progressBarStyleHorizontal"
+                android:max="100"
+                android:visibility="invisible"
+                />
+            <TextView
+                android:id="@+id/attachment_info"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_alignParentRight="true"
+                android:layout_above="@id/progress"
+                android:layout_marginLeft="16dip"
+                android:textSize="14dip"
+                android:textColor="@color/text_secondary_color"
+                android:singleLine="true"
+                android:gravity="right|bottom"
+                />
+            <TextView
+                android:id="@+id/attachment_name"
+                android:layout_width="0dip"
+                android:layout_height="wrap_content"
+                android:layout_alignParentLeft="true"
+                android:layout_toLeftOf="@id/attachment_info"
+                android:layout_above="@id/progress"
+                android:textSize="18dip"
+                android:textColor="@color/text_primary_color"
+                android:singleLine="true"
+                android:ellipsize="middle"
+                android:gravity="left|bottom"
+                />
+        </RelativeLayout>
+
+        <!-- Buttons -->
+        <LinearLayout
+            android:layout_width="224dip"
+            android:layout_height="match_parent"
+            android:layout_weight="0"
+            android:orientation="horizontal"
+            android:divider="?android:attr/dividerVertical"
+            android:showDividers="middle"
+            android:dividerPadding="16dip"
+            >
+            <Button
+                android:id="@+id/load"
+                android:layout_width="0dip"
+                android:layout_weight="1"
+                android:layout_height="match_parent"
+                android:layout_marginLeft="16dip"
+                android:layout_marginRight="16dip"
+                style="@android:style/Widget.Holo.Button.Borderless"
+                android:padding="0dip"
+                android:text="@string/message_view_attachment_load_action"
+                android:textSize="14dip"
+                android:textColor="@color/text_primary_color"
+                android:textStyle="bold"
+                android:singleLine="true"
+                android:ellipsize="end"
+                android:gravity="center"
+                android:visibility="gone"
+                />
+            <Button
+                android:id="@+id/cancel"
+                android:layout_width="0dip"
+                android:layout_weight="1"
+                android:layout_height="match_parent"
+                android:layout_marginLeft="16dip"
+                android:layout_marginRight="16dip"
+                style="@android:style/Widget.Holo.Button.Borderless"
+                android:padding="0dip"
+                android:text="@string/message_view_attachment_cancel_action"
+                android:textSize="14dip"
+                android:textColor="@color/text_primary_color"
+                android:textStyle="bold"
+                android:singleLine="true"
+                android:ellipsize="end"
+                android:gravity="center"
+                android:visibility="gone"
+                />
+            <Button
+                android:id="@+id/view"
+                android:layout_width="0dip"
+                android:layout_weight="1"
+                android:layout_height="match_parent"
+                android:layout_marginLeft="16dip"
+                android:layout_marginRight="16dip"
+                style="@android:style/Widget.Holo.Button.Borderless"
+                android:padding="0dip"
+                android:text="@string/message_view_attachment_view_action"
+                android:textSize="14dip"
+                android:textColor="@color/text_primary_color"
+                android:textStyle="bold"
+                android:singleLine="true"
+                android:ellipsize="end"
+                android:gravity="center"
+                android:visibility="gone"
+                />
+            <Button
+                android:id="@+id/save"
+                android:layout_width="0dip"
+                android:layout_weight="1"
+                android:layout_height="match_parent"
+                android:layout_marginLeft="16dip"
+                android:layout_marginRight="16dip"
+                style="@android:style/Widget.Holo.Button.Borderless"
+                android:padding="0dip"
+                android:text="@string/message_view_attachment_save_action"
+                android:textSize="14dip"
+                android:textColor="@color/text_primary_color"
+                android:textStyle="bold"
+                android:singleLine="true"
+                android:ellipsize="end"
+                android:gravity="center"
+                android:visibility="gone"
+                />
+        </LinearLayout>
+    </LinearLayout>
+</LinearLayout>
diff --git a/res/layout-xlarge/message_view_fragment.xml b/res/layout-xlarge/message_view_fragment.xml
index 7935fc525..d49245556 100644
--- a/res/layout-xlarge/message_view_fragment.xml
+++ b/res/layout-xlarge/message_view_fragment.xml
@@ -43,72 +43,71 @@
             <TextView
                 android:id="@+id/subject"
                 android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
+                android:layout_height="40dip"
                 android:layout_alignParentTop="true"
-                android:layout_marginTop="30dip"
-                android:layout_marginLeft="30dip"
-                android:layout_marginRight="30dip"
-                android:singleLine="false"
-                android:ellipsize="none"
+                android:layout_marginTop="0dip"
+                android:layout_marginLeft="16dip"
+                android:layout_marginRight="16dip"
+                android:singleLine="true"
+                android:ellipsize="end"
                 android:textSize="18dip"
                 android:textColor="@color/text_primary_color"
                 android:textStyle="bold"
-                />
-
-            <!-- Horizontal line below subject -->
-            <View
-                android:id="@+id/top_divider"
-                android:layout_width="0dip"
-                android:layout_below="@id/subject"
-                android:layout_alignLeft="@id/subject"
-                android:layout_alignRight="@id/subject"
-                android:layout_marginTop="8dip"
-                android:layout_marginBottom="16dip"
-                style="@style/message_view_horizontal_divider"
+                android:gravity="left|center_vertical"
                 />
 
             <!-- Badge -->
             <ImageButton
                 android:id="@+id/badge"
-                android:layout_width="60dip"
-                android:layout_height="60dip"
-                android:layout_gravity="center_vertical"
-                android:layout_alignTop="@id/top_divider"
+                android:layout_width="64dip"
+                android:layout_height="64dip"
+                android:layout_below="@id/subject"
                 android:layout_alignLeft="@id/subject"
+                android:padding="0dip"
                 android:scaleType="fitCenter"
                 />
-
-            <!-- Presence icon -->
-            <ImageView
-                android:id="@+id/presence"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/top_divider"
+            <!-- Background for sender name and buttons -->
+            <View
+                android:id="@+id/header_background"
+                android:layout_width="0dip"
+                android:layout_height="64dip"
+                android:layout_below="@id/subject"
                 android:layout_toRightOf="@id/badge"
-                android:layout_marginLeft="16dip"
-                android:layout_marginRight="12dip"
-                android:src="@drawable/presence_inactive"
-                android:background="@drawable/quickcontact_presence_bg"
+                android:layout_alignRight="@id/subject"
+                android:background="@drawable/message_header_bg"
                 />
+            <!-- Fold -->
+            <ImageView
+                android:id="@+id/header_background_fold"
+                android:layout_width="32dip"
+                android:layout_height="20dip"
+                android:layout_below="@id/header_background"
+                android:layout_alignRight="@id/header_background"
+                android:src="@drawable/message_header_fold"
+                android:padding="0dip"
+                />
+
             <!--
                 reply, reply-all, forward, Star
-                They can all be gone; don't refer to them from other views.
-                Instead refer to this outer layout.
+                These buttons can all be gone at runtime, so don't refer to individual buttons from
+                other views.  Instead refer to this outer layout.
             -->
             <LinearLayout
                 android:id="@+id/forward_reply_buttons"
                 android:layout_width="wrap_content"
-                android:layout_height="24dip"
-                android:layout_alignRight="@id/subject"
-                android:layout_below="@id/top_divider"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="16dip"
+                android:layout_marginLeft="8dip"
+                android:layout_marginRight="32dip"
+                android:layout_alignTop="@id/header_background"
+                android:layout_alignRight="@id/header_background"
                 android:orientation="horizontal"
                 >
                 <ImageButton
                     android:id="@+id/reply"
                     android:layout_width="32dip"
-                    android:layout_height="match_parent"
-                    android:layout_marginRight="16dip"
-                    android:layout_marginLeft="16dip"
+                    android:layout_height="32dip"
+                    android:layout_marginRight="32dip"
                     android:src="@drawable/ic_reply"
                     android:visibility="gone"
                     style="@android:style/Widget.Holo.Button.Borderless"
@@ -116,9 +115,8 @@
                 <ImageButton
                     android:id="@+id/reply_all"
                     android:layout_width="32dip"
-                    android:layout_height="match_parent"
-                    android:layout_marginRight="16dip"
-                    android:layout_marginLeft="16dip"
+                    android:layout_height="32dip"
+                    android:layout_marginRight="32dip"
                     android:src="@drawable/ic_reply_all"
                     android:visibility="gone"
                     style="@android:style/Widget.Holo.Button.Borderless"
@@ -126,9 +124,8 @@
                 <ImageButton
                     android:id="@+id/forward"
                     android:layout_width="32dip"
-                    android:layout_height="match_parent"
-                    android:layout_marginRight="16dip"
-                    android:layout_marginLeft="16dip"
+                    android:layout_height="32dip"
+                    android:layout_marginRight="32dip"
                     android:src="@drawable/ic_forward"
                     android:visibility="gone"
                     style="@android:style/Widget.Holo.Button.Borderless"
@@ -136,151 +133,127 @@
                 <ImageButton
                     android:id="@+id/favorite"
                     android:layout_width="32dip"
-                    android:layout_height="match_parent"
-                    android:layout_marginRight="16dip"
-                    android:layout_marginLeft="16dip"
+                    android:layout_height="32dip"
                     android:src="@drawable/ic_star_none_holo_light"
                     android:visibility="gone"
                     style="@android:style/Widget.Holo.Button.Borderless"
                     />
-             </LinearLayout>
+            </LinearLayout>
 
-            <!-- Sender display name -->
-            <TextView
-                android:id="@+id/from_name"
+
+            <!-- presence, sender address, sender name: make them center_vertical -->
+            <LinearLayout
+                android:id="@+id/presence_from_name"
                 android:layout_width="0dip"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/top_divider"
-                android:layout_toRightOf="@id/presence"
+                android:layout_height="0dip"
+                android:layout_marginLeft="32dip"
+                android:layout_marginRight="16dip"
+                android:layout_alignTop="@id/header_background"
+                android:layout_alignBottom="@id/header_background"
+                android:layout_alignLeft="@id/header_background"
                 android:layout_toLeftOf="@id/forward_reply_buttons"
-                android:textSize="18dip"
-                android:textColor="@color/text_primary_color"
+                android:gravity="center_vertical"
+                android:orientation="vertical"
+                >
+                <LinearLayout
+                    android:id="@+id/presence_from_name"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:orientation="horizontal"
+                    android:gravity="left|center_vertical"
+                    >
+                    <!-- Presence icon -->
+                    <ImageView
+                        android:id="@+id/presence"
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="0"
+                        android:src="@android:drawable/presence_offline"
+                        />
+
+                    <!-- Sender display name -->
+                    <TextView
+                        android:id="@+id/from_name"
+                        android:layout_width="0dip"
+                        android:layout_height="wrap_content"
+                        android:layout_weight="1"
+                        android:layout_marginLeft="4dip"
+                        android:textSize="18dip"
+                        android:textColor="@color/text_primary_color"
+                        android:textStyle="bold"
+                        android:singleLine="true"
+                        android:ellipsize="end"
+                        android:gravity="left|center_vertical"
+                        />
+                </LinearLayout>
+
+                <!-- From address -->
+                <TextView
+                    android:id="@+id/from_address"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="2dip"
+                    android:textSize="14dip"
+                    android:textColor="@color/text_secondary_color"
+                    android:singleLine="true"
+                    android:ellipsize="end"
+                    android:paddingRight="6dip"
+                    />
+            </LinearLayout>
+
+            <!-- Addresses, timestamp  -->
+            <Button
+                android:id="@+id/show_details"
+                android:layout_width="wrap_content"
+                android:layout_height="40dip"
+                android:layout_below="@id/header_background"
+                android:layout_toLeftOf="@id/header_background_fold"
+                android:layout_marginRight="16dip"
+                style="@android:style/Widget.Holo.Button.Borderless"
+                android:padding="0dip"
+                android:gravity="center_vertical"
+                android:text="@string/message_view_show_details"
+                android:textSize="14dip"
+                android:textColor="@color/text_ternary_color"
                 android:textStyle="bold"
                 android:singleLine="true"
-                android:ellipsize="end"
                 />
 
-            <!-- From address -->
-            <TextView
-                android:id="@+id/from_address"
-                android:layout_width="0dip"
-                android:layout_height="wrap_content"
-                android:layout_alignLeft="@id/presence"
-                android:layout_below="@id/presence"
-                android:layout_toLeftOf="@id/forward_reply_buttons"
-                android:layout_marginTop="2dip"
-                android:layout_marginBottom="8dip"
-                android:textSize="14dip"
-                android:textColor="@color/text_secondary_color"
-                android:singleLine="true"
-                android:ellipsize="end"
-                android:paddingRight="6dip"
-                />
-
-            <!-- To: and timestamp  -->
             <TextView
+                android:text="@string/message_view_show_details"
                 android:id="@+id/datetime"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/from_address"
-                android:layout_alignRight="@id/subject"
+                android:layout_height="40dip"
+                android:layout_below="@id/header_background"
+                android:layout_toLeftOf="@id/show_details"
+                android:layout_marginRight="48dip"
+                android:gravity="center_vertical"
                 android:textSize="14dip"
-                android:textColor="@color/text_secondary_color"
+                android:textColor="@color/text_ternary_color"
                 android:singleLine="true"
                 />
 
             <TextView
-                android:id="@+id/to_label"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignTop="@id/datetime"
-                android:layout_alignLeft="@id/from_address"
-                android:layout_marginRight="4dip"
-                android:textSize="14dip"
-                android:textColor="@color/text_secondary_color"
-                android:singleLine="true"
-                android:text="@string/message_compose_to_label"
-                />
-
-            <TextView
-                android:id="@+id/to"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignTop="@id/datetime"
-                android:layout_toRightOf="@id/to_label"
-                android:textSize="14dip"
-                android:textColor="@color/text_secondary_color"
-                android:singleLine="true"
-                />
-
-            <!-- Cc -->
-            <LinearLayout
-                android:id="@+id/cc_container"
+                android:id="@+id/addresses"
                 android:layout_width="0dip"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/to_label"
-                android:layout_alignLeft="@id/to_label"
-                android:layout_alignRight="@id/subject"
-                android:visibility="gone"
-                >
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginRight="4dip"
-                    android:textSize="14dip"
-                    android:textColor="@color/text_secondary_color"
-                    android:singleLine="true"
-                    android:text="@string/message_compose_cc_label"
-                    />
-                <TextView
-                    android:id="@+id/cc"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textSize="14dip"
-                    android:textColor="@color/text_secondary_color"
-                    android:singleLine="true"
-                    android:ellipsize="end"
-                    />
-            </LinearLayout>
-
-            <!-- Bcc -->
-            <LinearLayout
-                android:id="@+id/bcc_container"
-                android:layout_width="0dip"
-                android:layout_height="wrap_content"
-                android:layout_below="@id/cc_container"
-                android:layout_alignLeft="@id/to_label"
-                android:layout_alignRight="@id/subject"
-                android:visibility="gone"
-                >
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginRight="4dip"
-                    android:textSize="14dip"
-                    android:textColor="@color/text_secondary_color"
-                    android:singleLine="true"
-                    android:text="@string/message_compose_bcc_label"
-                    />
-                <TextView
-                    android:id="@+id/bcc"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:textSize="14dip"
-                    android:textColor="@color/text_secondary_color"
-                    android:singleLine="true"
-                    android:ellipsize="end"
-                    />
-            </LinearLayout>
+                android:layout_height="40dip"
+                android:layout_below="@id/header_background"
+                android:layout_alignLeft="@id/badge"
+                android:layout_toLeftOf="@id/datetime"
+                android:layout_marginRight="16dip"
+                android:gravity="center_vertical"
+                android:textSize="14dip"
+                android:textColor="@color/text_ternary_color"
+                android:singleLine="true"
+                android:ellipsize="end"
+                />
 
             <View
-                android:id="@+id/below_header_divider"
+                android:id="@+id/below_address_divider"
                 android:layout_width="0dip"
-                android:layout_below="@id/bcc_container"
-                android:layout_alignLeft="@id/bcc_container"
-                android:layout_alignRight="@id/subject"
-                android:layout_marginTop="8dip"
-                android:layout_marginBottom="2dip"
+                android:layout_below="@id/show_details"
+                android:layout_alignLeft="@id/addresses"
+                android:layout_alignRight="@id/show_details"
                 style="@style/message_view_horizontal_divider"
                 />
 
@@ -291,60 +264,87 @@
             <LinearLayout
                 android:layout_width="0dip"
                 android:layout_height="0dip"
-                android:layout_below="@id/below_header_divider"
-                android:layout_alignLeft="@id/below_header_divider"
-                android:layout_alignRight="@id/below_header_divider"
+                android:layout_below="@id/below_address_divider"
+                android:layout_alignLeft="@id/badge"
+                android:layout_alignRight="@id/header_background"
                 android:layout_alignParentBottom="true"
                 android:orientation="vertical"
                 >
-                <!-- Tabs -->
+                <!-- Tabs + divider -->
+                <!-- Can't use a RelativeLayout, because tabs can be GONE -->
                 <LinearLayout
                     android:id="@+id/message_tabs_section"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
-                    android:orientation="horizontal"
-                    android:paddingLeft="6dip"
-                    android:paddingRight="6dip"
-                    android:divider="?android:attr/dividerHorizontal"
-                    android:showDividers="beginning|middle|end"
-                    android:dividerPadding="8dip"
+                    android:orientation="vertical"
                     >
-                    <Button
-                        android:id="@+id/show_message"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:text="@string/message_view_show_message_action"
-                        style="@android:style/Widget.Holo.Light.Tab"
-                        />
-                    <Button
-                        android:id="@+id/show_invite"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:text="@string/message_view_show_invite_action"
-                        style="@android:style/Widget.Holo.Light.Tab"
-                        />
-                    <Button
-                        android:id="@+id/show_attachments"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        style="@android:style/Widget.Holo.Light.Tab"
-                        />
-                    <!-- filler -->
+                    <LinearLayout
+                        android:layout_width="match_parent"
+                        android:layout_height="40dip"
+                        android:orientation="horizontal"
+                        >
+                        <Button
+                            android:id="@+id/show_message"
+                            android:layout_width="128dip"
+                            android:layout_height="match_parent"
+                            android:layout_gravity="center"
+                            android:text="@string/message_view_show_message_action"
+                            android:textSize="14dip"
+                            android:textColor="@color/text_primary_color"
+                            android:singleLine="true"
+                            android:ellipsize="end"
+                            style="@android:style/Widget.Holo.Light.Tab"
+                            />
+                        <Button
+                            android:id="@+id/show_invite"
+                            android:layout_width="128dip"
+                            android:layout_height="match_parent"
+                            android:layout_gravity="center"
+                            android:text="@string/message_view_show_invite_action"
+                            android:textSize="14dip"
+                            android:textColor="@color/text_primary_color"
+                            android:singleLine="true"
+                            android:ellipsize="end"
+                            style="@android:style/Widget.Holo.Light.Tab"
+                            />
+                        <Button
+                            android:id="@+id/show_attachments"
+                            android:layout_width="128dip"
+                            android:layout_height="match_parent"
+                            android:layout_gravity="center"
+                            android:textSize="14dip"
+                            android:textColor="@color/text_primary_color"
+                            android:singleLine="true"
+                            android:ellipsize="end"
+                            style="@android:style/Widget.Holo.Light.Tab"
+                            />
+                        <!-- filler -->
+                        <View
+                            android:layout_width="0dip"
+                            android:layout_height="0dip"
+                            android:layout_weight="1"
+                            />
+                        <Button
+                            android:id="@+id/show_pictures"
+                            android:layout_width="wrap_content"
+                            android:layout_height="match_parent"
+                            android:layout_gravity="center"
+                            style="@android:style/Widget.Holo.Button.Borderless"
+                            android:padding="0dip"
+                            android:text="@string/message_view_show_pictures_action"
+                            android:textSize="14dip"
+                            android:textColor="@color/text_ternary_color"
+                            android:textStyle="bold"
+                            />
+                        <View
+                            android:layout_width="48dip"
+                            android:layout_height="0dip"
+                            />
+                    </LinearLayout>
                     <View
-                        android:layout_width="0dip"
-                        android:layout_height="0dip"
-                        android:layout_weight="1"
-                        />
-                    <Button
-                        android:id="@+id/show_pictures"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_gravity="center"
-                        android:text="@string/message_view_show_pictures_action"
-                        style="@android:style/Widget.Holo.Light.Tab"
+                        android:layout_width="match_parent"
+                        android:layout_marginBottom="16dip"
+                        style="@style/message_view_horizontal_divider"
                         />
                 </LinearLayout>
 
@@ -385,8 +385,9 @@
                         android:orientation="vertical"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:padding="4dip"
-                        android:background="#ffffff"
+                        android:background="@color/message_view_info_back_color"
+                        android:divider="?android:attr/dividerHorizontal"
+                        android:showDividers="beginning|middle|end"
                         />
                 </ScrollView>
 
diff --git a/res/layout-xlarge/message_view_invitation.xml b/res/layout-xlarge/message_view_invitation.xml
new file mode 100644
index 000000000..4ff3112b0
--- /dev/null
+++ b/res/layout-xlarge/message_view_invitation.xml
@@ -0,0 +1,139 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<!-- xlarge -->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/invite_section"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@color/message_view_info_back_color"
+    android:orientation="vertical"
+    >
+    <View
+        android:layout_width="match_parent"
+        style="@style/message_view_horizontal_divider"
+        />
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="64dip"
+        android:orientation="horizontal"
+        >
+        <!-- STOPSHIP Put icon here -->
+        <ImageView
+            android:layout_width="64dip"
+            android:layout_height="64dip"
+            android:layout_weight="0"
+            android:src="@null"
+            android:visibility="gone"
+            />
+        <LinearLayout
+            android:layout_width="200dip"
+            android:layout_weight="1"
+            android:layout_height="64dip"
+            android:orientation="horizontal"
+            android:divider="?android:attr/dividerVertical"
+            android:showDividers="middle"
+            android:dividerPadding="16dip"
+            >
+            <RelativeLayout
+                android:layout_width="0dip"
+                android:layout_height="match_parent"
+                android:layout_weight="1"
+                >
+                <CheckBox
+                    android:id="@+id/accept"
+                    android:layout_width="104dip"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentBottom="true"
+                    android:layout_alignParentLeft="true"
+                    android:layout_marginLeft="32dip"
+                    android:text="@string/message_view_invite_accept"
+                    android:textSize="14dip"
+                    android:textColor="@color/text_primary_color"
+                    android:singleLine="true"
+                    android:ellipsize="end"
+                    />
+                <CheckBox
+                    android:id="@+id/maybe"
+                    android:layout_width="104dip"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentBottom="true"
+                    android:layout_toRightOf="@id/accept"
+                    android:layout_marginLeft="24dip"
+                    android:text="@string/message_view_invite_maybe"
+                    android:textSize="14dip"
+                    android:textColor="@color/text_primary_color"
+                    android:singleLine="true"
+                    android:ellipsize="end"
+                    />
+                <CheckBox
+                    android:id="@+id/decline"
+                    android:layout_width="104dip"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentBottom="true"
+                    android:layout_toRightOf="@id/maybe"
+                    android:layout_marginLeft="24dip"
+                    android:text="@string/message_view_invite_decline"
+                    android:textSize="14dip"
+                    android:textColor="@color/text_primary_color"
+                    android:singleLine="true"
+                    android:ellipsize="end"
+                    />
+
+                <!-- "Going?" -->
+                <TextView
+                    android:layout_width="0dip"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentTop="true"
+                    android:layout_alignParentLeft="true"
+                    android:layout_alignParentRight="true"
+                    android:layout_above="@id/accept"
+                    android:layout_marginLeft="32dip"
+                    android:layout_marginRight="32dip"
+                    android:singleLine="true"
+                    android:ellipsize="end"
+                    android:text="@string/message_view_invite_text"
+                    android:textSize="18dip"
+                    android:textColor="@color/text_primary_color"
+                    android:gravity="left|bottom"
+                    />
+
+            </RelativeLayout>
+            <Button
+                android:id="@+id/invite_link"
+                android:layout_width="192dip"
+                android:layout_height="match_parent"
+                android:layout_marginLeft="16dip"
+                android:layout_marginRight="16dip"
+                style="@android:style/Widget.Holo.Button.Borderless"
+                android:padding="0dip"
+                android:text="@string/message_view_invite_view"
+                android:textSize="14dip"
+                android:textColor="@color/text_primary_color"
+                android:textStyle="bold"
+                android:singleLine="true"
+                android:ellipsize="end"
+                android:gravity="center"
+                />
+        </LinearLayout>
+    </LinearLayout>
+    <View
+        android:layout_width="match_parent"
+        style="@style/message_view_horizontal_divider"
+        />
+</LinearLayout>
diff --git a/res/layout/message_view_attachment.xml b/res/layout/message_view_attachment.xml
index 515f2a511..71acc39be 100644
--- a/res/layout/message_view_attachment.xml
+++ b/res/layout/message_view_attachment.xml
@@ -4,9 +4,9 @@
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
      You may obtain a copy of the License at
-  
+
           http://www.apache.org/licenses/LICENSE-2.0
-  
+
      Unless required by applicable law or agreed to in writing, software
      distributed under the License is distributed on an "AS IS" BASIS,
      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
@@ -14,6 +14,8 @@
      limitations under the License.
 -->
 
+<!-- Non-xlarge -->
+
 <FrameLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
diff --git a/res/layout/message_view_details.xml b/res/layout/message_view_details.xml
new file mode 100644
index 000000000..aa5685fdd
--- /dev/null
+++ b/res/layout/message_view_details.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2011 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+
+<TableLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:stretchColumns="2"
+    android:shrinkColumns="2"
+    >
+    <TableRow
+        android:id="@+id/date_row"
+        >
+        <TextView
+            android:layout_column="1"
+            android:text="@string/message_view_date_label"
+            android:padding="8dip"
+            android:textSize="14dip"
+            android:textColor="@color/text_secondary_color"
+            android:textStyle="bold"
+            />
+        <TextView
+            android:id="@+id/date"
+            android:padding="8dip"
+            android:textSize="14dip"
+            android:textColor="@color/text_secondary_color"
+            android:singleLine="false"
+            />
+    </TableRow>
+    <TableRow
+        android:id="@+id/to_row"
+        >
+        <TextView
+            android:layout_column="1"
+            android:text="@string/message_view_to_label"
+            android:padding="8dip"
+            android:textSize="14dip"
+            android:textColor="@color/text_secondary_color"
+            android:textStyle="bold"
+            />
+        <TextView
+            android:id="@+id/to"
+            android:padding="8dip"
+            android:textSize="14dip"
+            android:textColor="@color/text_secondary_color"
+            />
+    </TableRow>
+    <TableRow
+        android:id="@+id/cc_row"
+        >
+        <TextView
+            android:layout_column="1"
+            android:text="@string/message_view_cc_label"
+            android:padding="8dip"
+            android:textSize="14dip"
+            android:textColor="@color/text_secondary_color"
+            android:textStyle="bold"
+            />
+        <TextView
+            android:id="@+id/cc"
+            android:padding="8dip"
+            android:textSize="14dip"
+            android:textColor="@color/text_secondary_color"
+            />
+    </TableRow>
+    <TableRow
+        android:id="@+id/bcc_row"
+        >
+        <TextView
+            android:layout_column="1"
+            android:text="@string/message_view_bcc_label"
+            android:padding="8dip"
+            android:textSize="14dip"
+            android:textColor="@color/text_secondary_color"
+            android:textStyle="bold"
+            />
+        <TextView
+            android:id="@+id/bcc"
+            android:padding="8dip"
+            android:textSize="14dip"
+            android:textColor="@color/text_secondary_color"
+            />
+    </TableRow>
+</TableLayout>
diff --git a/res/layout/message_view_fragment.xml b/res/layout/message_view_fragment.xml
index c769cf3c4..4785c550f 100644
--- a/res/layout/message_view_fragment.xml
+++ b/res/layout/message_view_fragment.xml
@@ -46,7 +46,7 @@
                 />
             <ImageView
                 android:id="@+id/presence"
-                android:src="@drawable/presence_inactive"
+                android:src="@android:drawable/presence_offline"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginRight="5dip"
@@ -116,71 +116,17 @@
                 android:layout_marginLeft="4dip"
                 android:singleLine="true" />
         </LinearLayout>
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content" >
-            <TextView
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:textColor="?android:attr/textColorSecondary"
-                android:textStyle="bold"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/message_view_to_label" />
-            <TextView
-                android:id="@+id/to"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:textColor="?android:attr/textColorSecondary"
-                android:layout_width="0dip"
-                android:layout_weight="1.0"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="4dip"
-                android:singleLine="false"
-                android:ellipsize="none" />
-        </LinearLayout>
-        <LinearLayout
-            android:id="@+id/cc_container"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content" >
-            <TextView
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:textColor="?android:attr/textColorSecondary"
-                android:textStyle="bold"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/message_view_cc_label" />
-            <TextView
-                android:id="@+id/cc"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:textColor="?android:attr/textColorSecondary"
-                android:layout_width="0dip"
-                android:layout_weight="1.0"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="4dip"
-                android:singleLine="false"
-                android:ellipsize="none" />
-        </LinearLayout>
-        <LinearLayout
-            android:id="@+id/bcc_container"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content" >
-            <TextView
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:textColor="?android:attr/textColorSecondary"
-                android:textStyle="bold"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/message_view_bcc_label" />
-            <TextView
-                android:id="@+id/bcc"
-                android:textAppearance="?android:attr/textAppearanceSmall"
-                android:textColor="?android:attr/textColorSecondary"
-                android:layout_width="0dip"
-                android:layout_weight="1.0"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="4dip"
-                android:singleLine="false"
-                android:ellipsize="none" />
-        </LinearLayout>
+
+        <TextView
+            android:id="@+id/addresses"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:textColor="?android:attr/textColorSecondary"
+            android:layout_width="0dip"
+            android:layout_weight="1.0"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="4dip"
+            android:singleLine="false"
+            android:ellipsize="none" />
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content" >
diff --git a/res/layout/message_view_invitation.xml b/res/layout/message_view_invitation.xml
index f5b347ab1..b2df131cc 100644
--- a/res/layout/message_view_invitation.xml
+++ b/res/layout/message_view_invitation.xml
@@ -14,6 +14,8 @@
      limitations under the License.
 -->
 
+<!-- Non-xlarge -->
+
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/invite_section"
@@ -84,7 +86,7 @@
              android:textColor="?android:attr/textColorPrimaryInverse"
              />
 
-        <TextView
+        <CheckBox
              android:id="@+id/accept"
              android:layout_width="wrap_content"
              android:layout_height="wrap_content"
@@ -98,7 +100,7 @@
              android:focusable="true"
              />
 
-        <TextView
+        <CheckBox
              android:id="@+id/maybe"
              android:layout_width="wrap_content"
              android:layout_height="wrap_content"
@@ -112,7 +114,7 @@
              android:focusable="true"
              />
 
-        <TextView
+        <CheckBox
              android:id="@+id/decline"
              android:layout_width="wrap_content"
              android:layout_height="wrap_content"
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 3c712bcad..184558796 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -32,6 +32,7 @@
     <!-- Standard text colors -->
     <color name="text_primary_color">#ffffff</color>
     <color name="text_secondary_color">#666666</color>
+    <color name="text_ternary_color">#888888</color>
 
     <!-- STOPSHIP Use same color as EditText tray? -->
     <color name="divider_color">#ff808080</color>
@@ -57,4 +58,6 @@
     <color name="widget_unread_count_color">#4d4d4d</color>
     <color name="widget_default_text_color">#000000</color>
     <color name="widget_light_text_color">#666666</color>
+
+    <color name="message_view_info_back_color">#deecfa</color>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index b76139600..c56d87969 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -111,6 +111,8 @@
     <string name="add_cc_bcc_action">+ Cc/Bcc</string>
     <!-- Menu item -->
     <string name="add_attachment_action">Add attachment</string>
+    <!-- Generic button [CHAR LIMIT=16] -->
+    <string name="close_action">Close</string>
     <!-- Menu item (debug screen) -->
     <string name="dump_settings_action">Dump settings</string>
     <!-- Appears in choose attachment dialog title -->
@@ -300,6 +302,8 @@
     <!-- Label for CC field in read message view -->
     <string name="message_view_cc_label">Cc:</string>
     <string name="message_view_bcc_label">Bcc:</string>
+    <!-- Label for the date field. [CHAR LIMIT=20]-->
+    <string name="message_view_date_label">Date:</string>
     <!-- Button name to view an attachment (in another activity) [CHAR LIMIT=10]-->
     <string name="message_view_attachment_view_action">View</string>
     <!-- Button name, to load an attachment from the mail server [CHAR LIMIT=10]-->
@@ -351,6 +355,10 @@ save attachment.</string>
     <!-- Toast shown following a meeting invite reply, declined -->
     <string name="message_view_invite_toast_no">You have declined this invitation</string>
     <!--Confirmation dialog title shown when user tries to delete messages.  [CHAR LIMIT=16] -->
+    <!-- Link label to show to/cc/bcc of the curent message [CHAR LIMIT=32] -->
+    <string name="message_view_show_details">Show details</string>
+    <!-- Title of the dialog box to show to/cc/bcc of the message.  [CHAR LIMIT=32] -->
+    <string name="message_view_message_details_dialog_title">Message Details</string>
 
     <!-- Title of the EML viewer activity. [CHAR LIMIT=32] -->
     <string name="eml_view_title">Viewing
diff --git a/src/com/android/email/Utility.java b/src/com/android/email/Utility.java
index d20fa89fc..20fda2655 100644
--- a/src/com/android/email/Utility.java
+++ b/src/com/android/email/Utility.java
@@ -33,11 +33,11 @@ import android.content.ContentResolver;
 import android.content.ContentUris;
 import android.content.ContentValues;
 import android.content.Context;
-import android.content.pm.ActivityInfo;
 import android.content.res.Resources;
 import android.content.res.TypedArray;
 import android.database.Cursor;
 import android.database.CursorWrapper;
+import android.graphics.Typeface;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.AsyncTask;
@@ -47,7 +47,11 @@ import android.os.Parcel;
 import android.os.Parcelable;
 import android.provider.OpenableColumns;
 import android.telephony.TelephonyManager;
+import android.text.Spannable;
+import android.text.SpannableString;
+import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
+import android.text.style.StyleSpan;
 import android.util.Base64;
 import android.util.Log;
 import android.widget.AbsListView;
@@ -1172,6 +1176,20 @@ public class Utility {
         return name;
     }
 
+    /**
+     * Append a bold span to a {@link SpannableStringBuilder}.
+     */
+    public static SpannableStringBuilder appendBold(SpannableStringBuilder ssb, String text) {
+        if (!TextUtils.isEmpty(text)) {
+            SpannableString ss = new SpannableString(text);
+            ss.setSpan(new StyleSpan(Typeface.BOLD), 0, ss.length(),
+                    Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);
+            ssb.append(ss);
+        }
+
+        return ssb;
+    }
+
     /**
      * Stringify a cursor for logging purpose.
      */
diff --git a/src/com/android/email/activity/ContactStatusLoader.java b/src/com/android/email/activity/ContactStatusLoader.java
index bef168f1e..d6e1d1ea5 100644
--- a/src/com/android/email/activity/ContactStatusLoader.java
+++ b/src/com/android/email/activity/ContactStatusLoader.java
@@ -16,7 +16,6 @@
 
 package com.android.email.activity;
 
-import com.android.email.R;
 import com.android.email.Utility;
 
 import android.content.AsyncTaskLoader;
@@ -37,7 +36,7 @@ import android.util.Log;
  * Loader to load presence statuses and the contact photoes.
  */
 public class ContactStatusLoader extends AsyncTaskLoader<ContactStatusLoader.Result> {
-    public static final int PRESENCE_UNKNOWN_RESOURCE_ID = R.drawable.presence_inactive;
+    public static final int PRESENCE_UNKNOWN_RESOURCE_ID = android.R.drawable.presence_offline;
 
     /** email address -> photo id, presence */
     /* package */ static final String[] PROJECTION_PHOTO_ID_PRESENCE = new String[] {
diff --git a/src/com/android/email/activity/MessageViewFragment.java b/src/com/android/email/activity/MessageViewFragment.java
index 99ba4edb7..5ad3e6e9a 100644
--- a/src/com/android/email/activity/MessageViewFragment.java
+++ b/src/com/android/email/activity/MessageViewFragment.java
@@ -36,8 +36,9 @@ import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.CheckBox;
+import android.widget.CompoundButton;
 import android.widget.ImageView;
-import android.widget.TextView;
 
 import java.security.InvalidParameterException;
 
@@ -47,7 +48,8 @@ import java.security.InvalidParameterException;
  *
  * See {@link MessageViewBase} for the class relation diagram.
  */
-public class MessageViewFragment extends MessageViewFragmentBase {
+public class MessageViewFragment extends MessageViewFragmentBase
+        implements CheckBox.OnCheckedChangeListener {
     private ImageView mFavoriteIcon;
     private View mInviteSection;
 
@@ -56,9 +58,9 @@ public class MessageViewFragment extends MessageViewFragmentBase {
     private View mForwardButton;
 
     // calendar meeting invite answers
-    private TextView mMeetingYes;
-    private TextView mMeetingMaybe;
-    private TextView mMeetingNo;
+    private CheckBox mMeetingYes;
+    private CheckBox mMeetingMaybe;
+    private CheckBox mMeetingNo;
     private MessageCommandButtonView mCommandButtons;
     private int mPreviousMeetingResponse = -1;
 
@@ -163,9 +165,9 @@ public class MessageViewFragment extends MessageViewFragmentBase {
         mReplyButton = view.findViewById(R.id.reply);
         mReplyAllButton = view.findViewById(R.id.reply_all);
         mForwardButton = view.findViewById(R.id.forward);
-        mMeetingYes = (TextView) view.findViewById(R.id.accept);
-        mMeetingMaybe = (TextView) view.findViewById(R.id.maybe);
-        mMeetingNo = (TextView) view.findViewById(R.id.decline);
+        mMeetingYes = (CheckBox) view.findViewById(R.id.accept);
+        mMeetingMaybe = (CheckBox) view.findViewById(R.id.maybe);
+        mMeetingNo = (CheckBox) view.findViewById(R.id.decline);
 
         // Star is only visible on this fragment (as opposed to MessageFileViewFragment.)
         view.findViewById(R.id.favorite).setVisibility(View.VISIBLE);
@@ -174,9 +176,9 @@ public class MessageViewFragment extends MessageViewFragmentBase {
         mReplyButton.setOnClickListener(this);
         mReplyAllButton.setOnClickListener(this);
         mForwardButton.setOnClickListener(this);
-        mMeetingYes.setOnClickListener(this);
-        mMeetingMaybe.setOnClickListener(this);
-        mMeetingNo.setOnClickListener(this);
+        mMeetingYes.setOnCheckedChangeListener(this);
+        mMeetingMaybe.setOnCheckedChangeListener(this);
+        mMeetingNo.setOnCheckedChangeListener(this);
         view.findViewById(R.id.invite_link).setOnClickListener(this);
 
         // Show the command buttons at the bottom.
@@ -244,7 +246,9 @@ public class MessageViewFragment extends MessageViewFragmentBase {
     @Override
     protected void resetView() {
         super.resetView();
-        // TODO Hide command buttons.  (Careful when to re-show it)
+        mMeetingYes.setChecked(false);
+        mMeetingNo.setChecked(false);
+        mMeetingMaybe.setChecked(false);
     }
 
     @Override
@@ -362,18 +366,6 @@ public class MessageViewFragment extends MessageViewFragmentBase {
                 onClickFavorite();
                 return;
 
-            case R.id.accept:
-                onRespondToInvite(EmailServiceConstants.MEETING_REQUEST_ACCEPTED,
-                         R.string.message_view_invite_toast_yes);
-                return;
-            case R.id.maybe:
-                onRespondToInvite(EmailServiceConstants.MEETING_REQUEST_TENTATIVE,
-                         R.string.message_view_invite_toast_maybe);
-                return;
-            case R.id.decline:
-                onRespondToInvite(EmailServiceConstants.MEETING_REQUEST_DECLINED,
-                         R.string.message_view_invite_toast_no);
-                return;
             case R.id.invite_link:
                 onInviteLinkClicked();
                 return;
@@ -381,6 +373,25 @@ public class MessageViewFragment extends MessageViewFragmentBase {
         super.onClick(view);
     }
 
+    @Override
+    public void onCheckedChanged(CompoundButton view, boolean isChecked) {
+        if (!isChecked) return;
+        switch (view.getId()) {
+            case R.id.accept:
+                onRespondToInvite(EmailServiceConstants.MEETING_REQUEST_ACCEPTED,
+                        R.string.message_view_invite_toast_yes);
+                return;
+            case R.id.maybe:
+                onRespondToInvite(EmailServiceConstants.MEETING_REQUEST_TENTATIVE,
+                        R.string.message_view_invite_toast_maybe);
+                return;
+            case R.id.decline:
+                onRespondToInvite(EmailServiceConstants.MEETING_REQUEST_DECLINED,
+                        R.string.message_view_invite_toast_no);
+                return;
+        }
+    }
+
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
         switch (item.getItemId()) {
diff --git a/src/com/android/email/activity/MessageViewFragmentBase.java b/src/com/android/email/activity/MessageViewFragmentBase.java
index ec524691e..7bc30c1aa 100644
--- a/src/com/android/email/activity/MessageViewFragmentBase.java
+++ b/src/com/android/email/activity/MessageViewFragmentBase.java
@@ -45,6 +45,7 @@ import android.content.ContentUris;
 import android.content.Context;
 import android.content.Intent;
 import android.content.Loader;
+import android.content.res.Resources;
 import android.database.ContentObserver;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
@@ -55,6 +56,7 @@ import android.os.Environment;
 import android.os.Handler;
 import android.provider.ContactsContract;
 import android.provider.ContactsContract.QuickContact;
+import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
 import android.text.format.DateUtils;
 import android.util.Log;
@@ -105,11 +107,7 @@ public abstract class MessageViewFragmentBase extends Fragment implements View.O
     private TextView mFromNameView;
     private TextView mFromAddressView;
     private TextView mDateTimeView;
-    private TextView mToView;
-    private TextView mCcView;
-    private View mCcContainerView;
-    private TextView mBccView;
-    private View mBccContainerView;
+    private TextView mAddressesView;
     private WebView mMessageContentView;
     private LinearLayout mAttachments;
     private View mTabSection;
@@ -117,6 +115,7 @@ public abstract class MessageViewFragmentBase extends Fragment implements View.O
     private ImageView mSenderPresenceView;
     private View mMainView;
     private View mLoadingProgress;
+    private Button mShowDetailsButton;
 
     private TextView mMessageTab;
     private TextView mAttachmentTab;
@@ -289,11 +288,7 @@ public abstract class MessageViewFragmentBase extends Fragment implements View.O
         mSubjectView = (TextView) view.findViewById(R.id.subject);
         mFromNameView = (TextView) view.findViewById(R.id.from_name);
         mFromAddressView = (TextView) view.findViewById(R.id.from_address);
-        mToView = (TextView) view.findViewById(R.id.to);
-        mCcView = (TextView) view.findViewById(R.id.cc);
-        mCcContainerView = view.findViewById(R.id.cc_container);
-        mBccView = (TextView) view.findViewById(R.id.bcc);
-        mBccContainerView = view.findViewById(R.id.bcc_container);
+        mAddressesView = (TextView) view.findViewById(R.id.addresses);
         mDateTimeView = (TextView) view.findViewById(R.id.datetime);
         mMessageContentView = (WebView) view.findViewById(R.id.message_content);
         mAttachments = (LinearLayout) view.findViewById(R.id.attachments);
@@ -302,6 +297,7 @@ public abstract class MessageViewFragmentBase extends Fragment implements View.O
         mSenderPresenceView = (ImageView) view.findViewById(R.id.presence);
         mMainView = view.findViewById(R.id.main_panel);
         mLoadingProgress = view.findViewById(R.id.loading_progress);
+        mShowDetailsButton = (Button) view.findViewById(R.id.show_details);
 
         mFromNameView.setOnClickListener(this);
         mFromAddressView.setOnClickListener(this);
@@ -318,6 +314,7 @@ public abstract class MessageViewFragmentBase extends Fragment implements View.O
         mAttachmentTab.setOnClickListener(this);
         mShowPicturesTab.setOnClickListener(this);
         mInviteTab.setOnClickListener(this);
+        mShowDetailsButton.setOnClickListener(this);
 
         mAttachmentsScroll = view.findViewById(R.id.attachments_scroll);
         mInviteScroll = view.findViewById(R.id.invite_scroll);
@@ -560,8 +557,10 @@ public abstract class MessageViewFragmentBase extends Fragment implements View.O
         makeVisible(mMessageTab, messageTabVisible);
         makeVisible(mInviteTab, (tabFlags & TAB_FLAGS_HAS_INVITE) != 0);
         makeVisible(mAttachmentTab, (tabFlags & TAB_FLAGS_HAS_ATTACHMENT) != 0);
-        makeVisible(mShowPicturesTab, (tabFlags & TAB_FLAGS_HAS_PICTURES) != 0);
-        mShowPicturesTab.setEnabled((tabFlags & TAB_FLAGS_PICTURE_LOADED) == 0);
+
+        final boolean hasPictures = (tabFlags & TAB_FLAGS_HAS_PICTURES) != 0;
+        final boolean pictureLoaded = (tabFlags & TAB_FLAGS_PICTURE_LOADED) != 0;
+        makeVisible(mShowPicturesTab, hasPictures && !pictureLoaded);
 
         mAttachmentTab.setText(mContext.getResources().getQuantityString(
                 R.plurals.message_view_show_attachments_action,
@@ -725,7 +724,7 @@ public abstract class MessageViewFragmentBase extends Fragment implements View.O
         if (AttachmentDownloadService.getQueueSize() == 0) {
             // Set to invisible; if the button is still in this state one second from now, we'll
             // assume the download won't start right away, and we make the cancel button visible
-            attachment.cancelButton.setVisibility(View.INVISIBLE);
+            attachment.cancelButton.setVisibility(View.GONE);
             // Create the timed task that will change the button state
             new AsyncTask<Void, Void, Void>() {
                 @Override
@@ -737,7 +736,7 @@ public abstract class MessageViewFragmentBase extends Fragment implements View.O
                 }
                 @Override
                 protected void onPostExecute(Void result) {
-                    if (attachment.cancelButton.getVisibility() == View.INVISIBLE) {
+                    if (attachment.cancelButton.getVisibility() != View.VISIBLE) {
                         attachment.cancelButton.setVisibility(View.VISIBLE);
                     }
                 }
@@ -757,23 +756,21 @@ public abstract class MessageViewFragmentBase extends Fragment implements View.O
             attachment.loadButton.setVisibility(View.VISIBLE);
             attachment.cancelButton.setVisibility(View.GONE);
             ProgressBar bar = attachment.progressView;
-            bar.setVisibility(View.GONE);
+            bar.setVisibility(View.INVISIBLE);
         }
     }
 
     /**
-     * Called by ControllerResults. Show the "View" and "Save" buttons; hide "Load"
+     * Called by ControllerResults. Show the "View" and "Save" buttons; hide "Load" and "Stop"
      *
      * @param attachmentId the attachment that was just downloaded
      */
     private void doFinishLoadAttachment(long attachmentId) {
         AttachmentInfo info = findAttachmentInfo(attachmentId);
         if (info != null) {
-            info.loadButton.setVisibility(View.INVISIBLE);
             info.loadButton.setVisibility(View.GONE);
-            if (!TextUtils.isEmpty(info.name)) {
-                info.saveButton.setVisibility(View.VISIBLE);
-            }
+            info.cancelButton.setVisibility(View.GONE);
+            info.saveButton.setVisibility(TextUtils.isEmpty(info.name) ? View.GONE : View.VISIBLE);
             info.viewButton.setVisibility(View.VISIBLE);
         }
     }
@@ -789,6 +786,19 @@ public abstract class MessageViewFragmentBase extends Fragment implements View.O
         }
     }
 
+    private void onShowDetails() {
+        if (mMessage == null) {
+            return; // shouldn't happen
+        }
+        String date = formatDate(mMessage.mTimeStamp, true);
+        String to = Address.toString(Address.unpack(mMessage.mTo));
+        String cc = Address.toString(Address.unpack(mMessage.mCc));
+        String bcc = Address.toString(Address.unpack(mMessage.mBcc));
+        MessageViewMessageDetailsDialog dialog = MessageViewMessageDetailsDialog.newInstance(
+                getActivity(), date, to, cc, bcc);
+        dialog.show(getActivity().getFragmentManager(), null);
+    }
+
     @Override
     public void onClick(View view) {
         if (!isMessageOpen()) {
@@ -825,6 +835,9 @@ public abstract class MessageViewFragmentBase extends Fragment implements View.O
             case R.id.show_pictures:
                 onShowPicturesInHtml();
                 break;
+            case R.id.show_details:
+                onShowDetails();
+                break;
         }
     }
 
@@ -1132,7 +1145,7 @@ public abstract class MessageViewFragmentBase extends Fragment implements View.O
             attachmentProgress.setProgress(100);
             attachmentSave.setVisibility(View.VISIBLE);
             attachmentView.setVisibility(View.VISIBLE);
-            attachmentLoad.setVisibility(View.INVISIBLE);
+            attachmentLoad.setVisibility(View.GONE);
             attachmentCancel.setVisibility(View.GONE);
 
             Bitmap previewIcon = getPreviewIcon(attachmentInfo);
@@ -1141,8 +1154,9 @@ public abstract class MessageViewFragmentBase extends Fragment implements View.O
             }
         } else {
             // Show "Load"; hide "View" and "Save"
-            attachmentSave.setVisibility(View.INVISIBLE);
-            attachmentView.setVisibility(View.INVISIBLE);
+            attachmentSave.setVisibility(View.GONE);
+            attachmentView.setVisibility(View.GONE);
+
             // If the attachment is queued, show the indeterminate progress bar.  From this point,.
             // any progress changes will cause this to be replaced by the normal progress bar
             if (AttachmentDownloadService.isAttachmentQueued(attachment.mId)){
@@ -1227,24 +1241,43 @@ public abstract class MessageViewFragmentBase extends Fragment implements View.O
             mFromNameView.setText(" ");
             mFromAddressView.setText(" ");
         }
-        mDateTimeView.setText(formatDate(message.mTimeStamp));
-        mToView.setText(Address.toFriendly(Address.unpack(message.mTo)));
-        String friendlyCc = Address.toFriendly(Address.unpack(message.mCc));
-        mCcView.setText(friendlyCc);
-        mCcContainerView.setVisibility((friendlyCc != null) ? View.VISIBLE : View.GONE);
-        String friendlyBcc = Address.toFriendly(Address.unpack(message.mBcc));
-        mBccView.setText(friendlyBcc);
-        mBccContainerView.setVisibility((friendlyBcc != null) ? View.VISIBLE : View.GONE);
+        mDateTimeView.setText(formatDate(message.mTimeStamp, false));
+
+        // To/Cc/Bcc
+        final Resources res = mContext.getResources();
+        final SpannableStringBuilder ssb = new SpannableStringBuilder();
+        final String friendlyTo = Address.toFriendly(Address.unpack(message.mTo));
+        final String friendlyCc = Address.toFriendly(Address.unpack(message.mCc));
+        final String friendlyBcc = Address.toFriendly(Address.unpack(message.mBcc));
+
+        if (!TextUtils.isEmpty(friendlyTo)) {
+            Utility.appendBold(ssb, res.getString(R.string.message_view_to_label));
+            ssb.append(" ");
+            ssb.append(friendlyTo);
+        }
+        if (!TextUtils.isEmpty(friendlyCc)) {
+            ssb.append("  ");
+            Utility.appendBold(ssb, res.getString(R.string.message_view_cc_label));
+            ssb.append(" ");
+            ssb.append(friendlyCc);
+        }
+        if (!TextUtils.isEmpty(friendlyBcc)) {
+            ssb.append("  ");
+            Utility.appendBold(ssb, res.getString(R.string.message_view_bcc_label));
+            ssb.append(" ");
+            ssb.append(friendlyBcc);
+        }
+        mAddressesView.setText(ssb);
     }
 
-    private String formatDate(long millis) {
+    private String formatDate(long millis, boolean withYear) {
         StringBuilder sb = new StringBuilder();
         Formatter formatter = new Formatter(sb);
         DateUtils.formatDateRange(mContext, formatter, millis, millis,
                 DateUtils.FORMAT_SHOW_DATE
                 | DateUtils.FORMAT_ABBREV_ALL
                 | DateUtils.FORMAT_SHOW_TIME
-                | DateUtils.FORMAT_NO_YEAR);
+                | (withYear ? DateUtils.FORMAT_SHOW_YEAR : DateUtils.FORMAT_NO_YEAR));
         return sb.toString();
     }
 
diff --git a/src/com/android/email/activity/MessageViewMessageDetailsDialog.java b/src/com/android/email/activity/MessageViewMessageDetailsDialog.java
new file mode 100644
index 000000000..4194684a6
--- /dev/null
+++ b/src/com/android/email/activity/MessageViewMessageDetailsDialog.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright (C) 2011 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.email.activity;
+
+import com.android.email.R;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.app.DialogFragment;
+import android.content.DialogInterface;
+import android.content.DialogInterface.OnClickListener;
+import android.os.Bundle;
+import android.text.TextUtils;
+import android.view.View;
+import android.widget.TextView;
+
+/**
+ * "Message Details" dialog box.
+ */
+public class MessageViewMessageDetailsDialog  extends DialogFragment {
+    private static final String BUNDLE_DATE = "date";
+    private static final String BUNDLE_TO = "to";
+    private static final String BUNDLE_CC = "cc";
+    private static final String BUNDLE_BCC = "bcc";
+    private static final String TextView = null;
+
+    public static MessageViewMessageDetailsDialog newInstance(Activity parent, String date,
+            String to, String cc, String bcc) {
+        MessageViewMessageDetailsDialog dialog = new MessageViewMessageDetailsDialog();
+        Bundle args = new Bundle();
+        args.putString(BUNDLE_DATE, date);
+        args.putString(BUNDLE_TO, to);
+        args.putString(BUNDLE_CC, cc);
+        args.putString(BUNDLE_BCC, bcc);
+        dialog.setArguments(args);
+        return dialog;
+    }
+
+    @Override
+    public Dialog onCreateDialog(Bundle savedInstanceState) {
+        final Activity activity = getActivity();
+
+        AlertDialog.Builder builder = new AlertDialog.Builder(activity).setTitle(
+                activity.getResources().getString(
+                        R.string.message_view_message_details_dialog_title));
+        builder.setNegativeButton(R.string.close_action, new OnClickListener() {
+            @Override
+            public void onClick(DialogInterface dialog, int which) {
+                dismiss();
+            }
+        });
+        builder.setView(initView());
+
+        return builder.show();
+    }
+
+    private View initView() {
+        View root = getActivity().getLayoutInflater().inflate(R.layout.message_view_details, null);
+        Bundle args = getArguments();
+
+        setText(root, args.getString(BUNDLE_DATE), R.id.date, R.id.date_row);
+        setText(root, args.getString(BUNDLE_TO), R.id.to, R.id.to_row);
+        setText(root, args.getString(BUNDLE_CC), R.id.cc, R.id.cc_row);
+        setText(root, args.getString(BUNDLE_BCC), R.id.bcc, R.id.bcc_row);
+
+        return root;
+    }
+
+    private static void setText(View root, String text, int textViewId, int rowViewId) {
+        if (TextUtils.isEmpty(text)) {
+            root.findViewById(rowViewId).setVisibility(View.GONE);
+            return;
+        }
+        ((TextView) root.findViewById(textViewId)).setText(text);
+    }
+}
diff --git a/src/com/android/email/mail/Address.java b/src/com/android/email/mail/Address.java
index 4fb1c32c9..9453a61ba 100644
--- a/src/com/android/email/mail/Address.java
+++ b/src/com/android/email/mail/Address.java
@@ -32,7 +32,7 @@ import java.util.regex.Pattern;
 
 /**
  * This class represent email address.
- * 
+ *
  * RFC822 email address may have following format.
  *   "name" <address> (comment)
  *   "name" <address>
@@ -85,7 +85,7 @@ public class Address {
 
     /**
      * Get name part as UTF-16 string. No surrounding double quote, and no MIME/base64 encoding.
-     * 
+     *
      * @return Name part of email address. Returns null if it is omitted.
      */
     public String getPersonal() {
@@ -95,7 +95,7 @@ public class Address {
     /**
      * Set name part from UTF-16 string. Optional surrounding double quote will be removed.
      * It will be also unquoted and MIME/base64 decoded.
-     * 
+     *
      * @param Personal name part of email address as UTF-16 string. Null is acceptable.
      */
     public void setPersonal(String personal) {
@@ -133,7 +133,7 @@ public class Address {
     /**
      * Parse a comma-delimited list of addresses in RFC822 format and return an
      * array of Address objects.
-     * 
+     *
      * @param addressList Address list in comma-delimited string.
      * @return An array of 0 or more Addresses.
      */
@@ -158,8 +158,8 @@ public class Address {
         }
         return addresses.toArray(new Address[] {});
     }
-    
-    /** 
+
+    /**
      * Checks whether a string email address is valid.
      * E.g. name@domain.com is valid.
      */
@@ -195,12 +195,12 @@ public class Address {
     /**
      * Get human readable address string.
      * Do not use this for email header.
-     * 
+     *
      * @return Human readable address string.  Not quoted and not encoded.
      */
     @Override
     public String toString() {
-        if (mPersonal != null) {
+        if (mPersonal != null && !mPersonal.equals(mAddress)) {
             if (mPersonal.matches(".*[\\(\\)<>@,;:\\\\\".\\[\\]].*")) {
                 return Utility.quoteString(mPersonal) + " <" + mAddress + ">";
             } else {
@@ -213,7 +213,7 @@ public class Address {
 
     /**
      * Get human readable comma-delimited address string.
-     * 
+     *
      * @param addresses Address array
      * @return Human readable comma-delimited address string.
      */
@@ -231,10 +231,10 @@ public class Address {
         }
         return sb.toString();
     }
-    
+
     /**
      * Get RFC822/MIME compatible address string.
-     * 
+     *
      * @return RFC822/MIME compatible address string.
      * It may be surrounded by double quote or quoted and MIME/base64 encoded if necessary.
      */
@@ -248,7 +248,7 @@ public class Address {
 
     /**
      * Get RFC822/MIME compatible comma-delimited address string.
-     * 
+     *
      * @param addresses Address array
      * @return RFC822/MIME compatible comma-delimited address string.
      * it may be surrounded by double quoted or quoted and MIME/base64 encoded if necessary.
@@ -268,11 +268,11 @@ public class Address {
         }
         return sb.toString();
     }
-    
+
     /**
      * Get Human friendly address string.
-     * 
-     * @return the personal part of this Address, or the address part if the 
+     *
+     * @return the personal part of this Address, or the address part if the
      * personal part is not available
      */
     public String toFriendly() {
@@ -282,11 +282,11 @@ public class Address {
             return mAddress;
         }
     }
-    
+
     /**
-     * Creates a comma-delimited list of addresses in the "friendly" format (see toFriendly() for 
+     * Creates a comma-delimited list of addresses in the "friendly" format (see toFriendly() for
      * details on the per-address conversion).
-     * 
+     *
      * @param addresses Array of Address[] values
      * @return A comma-delimited string listing all of the addresses supplied.  Null if source
      * was null or empty.
@@ -466,7 +466,7 @@ public class Address {
             else {
                 address =
                     Utility.fastUrlDecode(addressList.substring(pairStartIndex, addressEndIndex));
-                personal = 
+                personal =
                     Utility.fastUrlDecode(addressList.substring(addressEndIndex + 1, pairEndIndex));
             }
             addresses.add(new Address(address, personal));
diff --git a/tests/src/com/android/email/UtilityUnitTests.java b/tests/src/com/android/email/UtilityUnitTests.java
index 25a3c2d60..eef5a542c 100644
--- a/tests/src/com/android/email/UtilityUnitTests.java
+++ b/tests/src/com/android/email/UtilityUnitTests.java
@@ -27,6 +27,7 @@ import android.content.Context;
 import android.database.Cursor;
 import android.database.CursorWrapper;
 import android.database.MatrixCursor;
+import android.graphics.Typeface;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Bundle;
@@ -37,6 +38,7 @@ import android.telephony.TelephonyManager;
 import android.test.AndroidTestCase;
 import android.test.MoreAsserts;
 import android.test.suitebuilder.annotation.SmallTest;
+import android.text.SpannableStringBuilder;
 import android.text.TextUtils;
 import android.util.Log;
 import android.widget.ListView;
@@ -479,6 +481,16 @@ public class UtilityUnitTests extends AndroidTestCase {
         Utility.CloseTraceCursorWrapper.log(null);
     }
 
+    public void testAppendBold() {
+        SpannableStringBuilder ssb = new SpannableStringBuilder();
+        ssb.append("no");
+
+        assertEquals(ssb, Utility.appendBold(ssb, "BO"));
+
+        assertEquals("noBO", ssb.toString());
+        // TODO check style -- but how?
+    }
+
     /**
      * A {@link ListView} used by {@link #testListStateSaver}.
      */
diff --git a/tests/src/com/android/email/mail/AddressUnitTests.java b/tests/src/com/android/email/mail/AddressUnitTests.java
index 87d1452c3..ba4f50012 100644
--- a/tests/src/com/android/email/mail/AddressUnitTests.java
+++ b/tests/src/com/android/email/mail/AddressUnitTests.java
@@ -29,8 +29,8 @@ import java.io.UnsupportedEncodingException;
  */
 @SmallTest
 public class AddressUnitTests extends AndroidTestCase {
-    
-    private static final String MULTI_ADDRESSES_LIST = 
+
+    private static final String MULTI_ADDRESSES_LIST =
             "noname1@dom1.com, "
             + "<noname2@dom2.com>, "
             + "simple name <address3@dom3.org>, "
@@ -39,19 +39,21 @@ public class AddressUnitTests extends AndroidTestCase {
             + "\u65E5\u672C\u8A9E <address6@co.jp>,"
             + "\"\u65E5\u672C\u8A9E\" <address7@co.jp>,"
             + "\uD834\uDF01\uD834\uDF46 <address8@ne.jp>,"
-            + "\"\uD834\uDF01\uD834\uDF46\" <address9@ne.jp>";
-    private static final int MULTI_ADDRESSES_COUNT = 9;
+            + "\"\uD834\uDF01\uD834\uDF46\" <address9@ne.jp>,"
+            + "noname@dom.com <noname@dom.com>" // personal == address
+            ;
+    private static final int MULTI_ADDRESSES_COUNT = 10;
 
     private static final Address PACK_ADDR_1 = new Address("john@gmail.com", "John Doe");
     private static final Address PACK_ADDR_2 = new Address("foo@bar.com", null);
     private static final Address PACK_ADDR_3 = new Address("mar.y+test@gmail.com", "Mar-y, B; B*arr");
     private static final Address[][] PACK_CASES = {
-        {PACK_ADDR_2}, {PACK_ADDR_1}, 
-        {PACK_ADDR_1, PACK_ADDR_2}, {PACK_ADDR_2, PACK_ADDR_1}, 
-        {PACK_ADDR_1, PACK_ADDR_3}, {PACK_ADDR_2, PACK_ADDR_2}, 
+        {PACK_ADDR_2}, {PACK_ADDR_1},
+        {PACK_ADDR_1, PACK_ADDR_2}, {PACK_ADDR_2, PACK_ADDR_1},
+        {PACK_ADDR_1, PACK_ADDR_3}, {PACK_ADDR_2, PACK_ADDR_2},
         {PACK_ADDR_1, PACK_ADDR_2, PACK_ADDR_3}, {PACK_ADDR_3, PACK_ADDR_1, PACK_ADDR_2}
     };
-    
+
     Address mAddress1;
     Address mAddress2;
     Address mAddress3;
@@ -95,61 +97,61 @@ public class AddressUnitTests extends AndroidTestCase {
     public void testSetAddress() {
         String bareAddress = "user1@dom1.com";
         String bracketAddress = "<user2@dom2.com>";
-        
+
         Address address = new Address(bareAddress);
         assertEquals("bare address", "user1@dom1.com", address.getAddress());
-        
+
         address.setAddress(bracketAddress);
         assertEquals("bracket address", "user2@dom2.com", address.getAddress());
     }
-    
+
     /**
      * Test for empty setPersonal().
      */
     public void testNullPersonal() {
         Address address = new Address("user1@dom1.org");
         assertNull("no name", address.getPersonal());
-        
+
         address.setPersonal(null);
         assertNull("null name", address.getPersonal());
-        
+
         address.setPersonal("");
         assertNull("empty name", address.getPersonal());
-        
+
         address.setPersonal("\"\"");
         assertNull("quoted empty address", address.getPersonal());
     }
-    
+
     /**
      * Test for setPersonal().
      */
     public void testSetPersonal() {
         Address address = new Address("user1@dom1.net", "simple name");
         assertEquals("simple name", "simple name", address.getPersonal());
-        
+
         address.setPersonal("big \\\"G\\\"");
         assertEquals("quoted name", "big \"G\"", address.getPersonal());
-        
+
         address.setPersonal("=?UTF-8?Q?big \"G\"?=");
         assertEquals("quoted printable name", "big \"G\"", address.getPersonal());
-        
+
         address.setPersonal("=?UTF-8?B?YmlnICJHIg==?=");
         assertEquals("base64 encoded name", "big \"G\"", address.getPersonal());
     }
-    
+
     /**
      * Test for setPersonal() with utf-16 and utf-32.
      */
     public void testSetPersonalMultipleEncodings() {
         Address address = new Address("user1@dom1.co.jp", "=?UTF-8?B?5bK45pys?=");
         assertEquals("base64 utf-16 name", "\u5CB8\u672C", address.getPersonal());
-        
+
         address.setPersonal("\"=?UTF-8?Q?=E5=B2=B8=E6=9C=AC?=\"");
         assertEquals("quoted printable utf-16 name", "\u5CB8\u672C", address.getPersonal());
-        
+
         address.setPersonal("=?ISO-2022-JP?B?GyRCNF9LXBsoQg==?=");
         assertEquals("base64 jis encoded name", "\u5CB8\u672C", address.getPersonal());
-        
+
         address.setPersonal("\"=?UTF-8?B?8J2MgfCdjYY=?=\"");
         assertEquals("base64 utf-32 name", "\uD834\uDF01\uD834\uDF46", address.getPersonal());
 
@@ -157,28 +159,28 @@ public class AddressUnitTests extends AndroidTestCase {
         assertEquals("quoted printable utf-32 name",
                 "\uD834\uDF01\uD834\uDF46", address.getPersonal());
     }
-    
+
     /**
      * TODO: more in-depth tests for parse()
      */
-    
+
     /**
      * Simple quick checks of empty-input edge conditions for parse()
-     * 
+     *
      * NOTE:  This is not a claim that these edge cases are "correct", only to maintain consistent
      * behavior while I am changing some of the code in the function under test.
      */
     public void testEmptyParse() {
         Address[] result;
-        
+
         // null input => empty array
         result = Address.parse(null);
         assertTrue("parsing null address", result != null && result.length == 0);
-        
+
         // empty string input => empty array
         result = Address.parse("");
         assertTrue("parsing zero-length", result != null && result.length == 0);
-        
+
         // spaces
         result = Address.parse("   ");
         assertTrue("parsing spaces", result != null && result.length == 0);
@@ -187,7 +189,7 @@ public class AddressUnitTests extends AndroidTestCase {
         result = Address.parse("  ,  ");
         assertTrue("parsing spaces with comma", result != null && result.length == 0);
     }
-    
+
     /**
      * Test parsing for single address.
      */
@@ -212,7 +214,7 @@ public class AddressUnitTests extends AndroidTestCase {
         assertEquals("address with quoted name", "address4@dom4.org", address4[0].getAddress());
         assertEquals("name of address with quoted name", "first,last", address4[0].getPersonal());
     }
-    
+
     /**
      * Test parsing for illegal address.
      */
@@ -222,7 +224,7 @@ public class AddressUnitTests extends AndroidTestCase {
 
         Address[] address2 = Address.parse("address2@");
         assertEquals("no domain", 0, address2.length);
-        
+
         Address[] address3 = Address.parse("@dom3.com");
         assertEquals("no local part", 0, address3.length);
 
@@ -238,7 +240,7 @@ public class AddressUnitTests extends AndroidTestCase {
         Address[] address7 = Address.parse("address7@.dom7.org");
         assertEquals("domain starts with dot", 0, address7.length);
     }
-    
+
     /**
      * Test parsing for address part.
      */
@@ -252,7 +254,7 @@ public class AddressUnitTests extends AndroidTestCase {
         assertEquals("bracket address", "address2@dom2.com", addresses[1].getAddress());
         assertNull("bracket address name", addresses[1].getPersonal());
     }
-    
+
     /**
      * Test parsing for simple name part.
      */
@@ -261,14 +263,14 @@ public class AddressUnitTests extends AndroidTestCase {
                 "name 1 <address1@dom1.net>, " +
                 "\"name,2\" <address2@dom2.org>");
         assertEquals("address count", 2, addresses.length);
-        
+
         assertEquals("bare name address", "address1@dom1.net", addresses[0].getAddress());
         assertEquals("bare name", "name 1", addresses[0].getPersonal());
 
         assertEquals("double quoted name address", "address2@dom2.org", addresses[1].getAddress());
         assertEquals("double quoted name", "name,2", addresses[1].getPersonal());
     }
-    
+
     /**
      * Test parsing for utf-16 name part.
      */
@@ -277,7 +279,7 @@ public class AddressUnitTests extends AndroidTestCase {
                 "\u3042\u3044\u3046 \u3048\u304A <address1@dom1.jp>, " +
                 "\"\u3042\u3044\u3046,\u3048\u304A\" <address2@dom2.jp>");
         assertEquals("address count", 2, addresses.length);
-        
+
         assertEquals("bare utf-16 name address", "address1@dom1.jp", addresses[0].getAddress());
         assertEquals("bare utf-16 name",
                 "\u3042\u3044\u3046 \u3048\u304A", addresses[0].getPersonal());
@@ -287,7 +289,7 @@ public class AddressUnitTests extends AndroidTestCase {
         assertEquals("double quoted utf-16 name",
                 "\u3042\u3044\u3046,\u3048\u304A", addresses[1].getPersonal());
     }
-    
+
     /**
      * Test parsing for utf-32 name part.
      */
@@ -296,7 +298,7 @@ public class AddressUnitTests extends AndroidTestCase {
                 "\uD834\uDF01\uD834\uDF46 \uD834\uDF22 <address1@dom1.net>, " +
                 "\"\uD834\uDF01\uD834\uDF46,\uD834\uDF22\" <address2@dom2.com>");
         assertEquals("address count", 2, addresses.length);
-        
+
         assertEquals("bare utf-32 name address", "address1@dom1.net", addresses[0].getAddress());
         assertEquals("bare utf-32 name",
                 "\uD834\uDF01\uD834\uDF46 \uD834\uDF22", addresses[0].getPersonal());
@@ -306,15 +308,15 @@ public class AddressUnitTests extends AndroidTestCase {
         assertEquals("double quoted utf-32 name",
                 "\uD834\uDF01\uD834\uDF46,\uD834\uDF22", addresses[1].getPersonal());
     }
-    
+
     /**
      * Test parsing for multi addresses.
      */
     public void testParseMulti() {
         Address[] addresses = Address.parse(MULTI_ADDRESSES_LIST);
-        
+
         assertEquals("multi addrsses count", MULTI_ADDRESSES_COUNT, addresses.length);
-        
+
         assertEquals("no name 1 address", "noname1@dom1.com", addresses[0].getAddress());
         assertNull("no name 1 name", addresses[0].getPersonal());
         assertEquals("no name 2 address", "noname2@dom2.com", addresses[1].getAddress());
@@ -325,24 +327,24 @@ public class AddressUnitTests extends AndroidTestCase {
         assertEquals("double quoted name name", "name,4", addresses[3].getPersonal());
         assertEquals("quoted name address", "bigG@dom5.net", addresses[4].getAddress());
         assertEquals("quoted name name", "big \"G\"", addresses[4].getPersonal());
-        assertEquals("utf-16 name address", "address6@co.jp", addresses[5].getAddress());       
-        assertEquals("utf-16 name name", "\u65E5\u672C\u8A9E", addresses[5].getPersonal());       
-        assertEquals("utf-16 quoted name address", "address7@co.jp", addresses[6].getAddress());       
+        assertEquals("utf-16 name address", "address6@co.jp", addresses[5].getAddress());
+        assertEquals("utf-16 name name", "\u65E5\u672C\u8A9E", addresses[5].getPersonal());
+        assertEquals("utf-16 quoted name address", "address7@co.jp", addresses[6].getAddress());
         assertEquals("utf-16 quoted name name", "\u65E5\u672C\u8A9E",
-                addresses[6].getPersonal());       
-        assertEquals("utf-32 name address", "address8@ne.jp", addresses[7].getAddress());       
-        assertEquals("utf-32 name name", "\uD834\uDF01\uD834\uDF46", addresses[7].getPersonal());       
-        assertEquals("utf-32 quoted name address", "address9@ne.jp", addresses[8].getAddress());       
+                addresses[6].getPersonal());
+        assertEquals("utf-32 name address", "address8@ne.jp", addresses[7].getAddress());
+        assertEquals("utf-32 name name", "\uD834\uDF01\uD834\uDF46", addresses[7].getPersonal());
+        assertEquals("utf-32 quoted name address", "address9@ne.jp", addresses[8].getAddress());
         assertEquals("utf-32 quoted name name", "\uD834\uDF01\uD834\uDF46",
-                addresses[8].getPersonal());       
+                addresses[8].getPersonal());
     }
-    
+
     /**
      * Test various combinations of the toString (single) method
      */
     public void testToStringSingle() {
         Address[] addresses = Address.parse(MULTI_ADDRESSES_LIST);
-        
+
         assertEquals("multi addrsses count", MULTI_ADDRESSES_COUNT, addresses.length);
 
         // test for toString() results.
@@ -352,25 +354,26 @@ public class AddressUnitTests extends AndroidTestCase {
         assertEquals("double quoted name", "\"name,4\" <address4@dom4.org>", addresses[3].toString());
         assertEquals("quoted name", "\"big \"G\"\" <bigG@dom5.net>", addresses[4].toString());
         assertEquals("utf-16 name", "\u65E5\u672C\u8A9E <address6@co.jp>",
-                addresses[5].toString());       
+                addresses[5].toString());
         assertEquals("utf-16 quoted name", "\u65E5\u672C\u8A9E <address7@co.jp>",
-                addresses[6].toString());       
+                addresses[6].toString());
         assertEquals("utf-32 name", "\uD834\uDF01\uD834\uDF46 <address8@ne.jp>",
-                addresses[7].toString());       
+                addresses[7].toString());
         assertEquals("utf-32 quoted name", "\uD834\uDF01\uD834\uDF46 <address9@ne.jp>",
-                addresses[8].toString());       
+                addresses[8].toString());
+        assertEquals("name==address", "noname@dom.com", addresses[9].toString());
     }
-    
+
     /**
      * Test various combinations of the toString (multi) method
      */
     public void testToStringMulti() {
         Address[] addresses = Address.parse(MULTI_ADDRESSES_LIST);
-        
+
         assertEquals("multi addrsses count", MULTI_ADDRESSES_COUNT, addresses.length);
 
         String line = Address.toString(addresses);
-        assertEquals("toString multi", 
+        assertEquals("toString multi",
                 "noname1@dom1.com,"
                 + "noname2@dom2.com,"
                 + "simple name <address3@dom3.org>,"
@@ -379,7 +382,8 @@ public class AddressUnitTests extends AndroidTestCase {
                 + "\u65E5\u672C\u8A9E <address6@co.jp>,"
                 + "\u65E5\u672C\u8A9E <address7@co.jp>,"
                 + "\uD834\uDF01\uD834\uDF46 <address8@ne.jp>,"
-                + "\uD834\uDF01\uD834\uDF46 <address9@ne.jp>",
+                + "\uD834\uDF01\uD834\uDF46 <address9@ne.jp>,"
+                + "noname@dom.com",
                 line);
     }
 
@@ -410,7 +414,8 @@ public class AddressUnitTests extends AndroidTestCase {
         Address quotedName = new Address("bigG@dom5.net", "big \"G\"");
         Address utf16Name = new Address("<address6@co.jp>", "\"\u65E5\u672C\u8A9E\"");
         Address utf32Name = new Address("<address8@ne.jp>", "\uD834\uDF01\uD834\uDF46");
-        
+        Address sameName = new Address("address@dom.org", "address@dom.org");
+
         // test for internal states.
         assertEquals("no name 1 address", "noname1@dom1.com", noName1.getAddress());
         assertNull("no name 1 name", noName1.getPersonal());
@@ -422,10 +427,12 @@ public class AddressUnitTests extends AndroidTestCase {
         assertEquals("double quoted name name", "name,4", dquoteName.getPersonal());
         assertEquals("quoted name address", "bigG@dom5.net", quotedName.getAddress());
         assertEquals("quoted name name", "big \"G\"", quotedName.getPersonal());
-        assertEquals("utf-16 name address", "address6@co.jp", utf16Name.getAddress());       
-        assertEquals("utf-16 name name", "\u65E5\u672C\u8A9E", utf16Name.getPersonal());       
-        assertEquals("utf-32 name address", "address8@ne.jp", utf32Name.getAddress());       
-        assertEquals("utf-32 name name", "\uD834\uDF01\uD834\uDF46", utf32Name.getPersonal());       
+        assertEquals("utf-16 name address", "address6@co.jp", utf16Name.getAddress());
+        assertEquals("utf-16 name name", "\u65E5\u672C\u8A9E", utf16Name.getPersonal());
+        assertEquals("utf-32 name address", "address8@ne.jp", utf32Name.getAddress());
+        assertEquals("utf-32 name name", "\uD834\uDF01\uD834\uDF46", utf32Name.getPersonal());
+        assertEquals("name == address address", "address@dom.org", sameName.getAddress());
+        assertEquals("name == address name", "address@dom.org", sameName.getPersonal());
 
         // Test for toHeader() results.
         assertEquals("no name 1", "noname1@dom1.com", noName1.toHeader());
@@ -434,11 +441,13 @@ public class AddressUnitTests extends AndroidTestCase {
         assertEquals("double quoted name", "\"name,4\" <address4@dom4.org>", dquoteName.toHeader());
         assertEquals("quoted name", "\"big \\\"G\\\"\" <bigG@dom5.net>", quotedName.toHeader());
         assertEquals("utf-16 name", "=?UTF-8?B?5pel5pys6Kqe?= <address6@co.jp>",
-                utf16Name.toHeader());       
+                utf16Name.toHeader());
         assertEquals("utf-32 name", "=?UTF-8?B?8J2MgfCdjYY=?= <address8@ne.jp>",
-                utf32Name.toHeader());       
+                utf32Name.toHeader());
+        assertEquals("name == address", "\"address@dom.org\" <address@dom.org>",
+                sameName.toHeader());
     }
-    
+
     /**
      * Test various combinations of the toHeader (multi) method
      */
@@ -450,7 +459,7 @@ public class AddressUnitTests extends AndroidTestCase {
         Address quotedName = new Address("bigG@dom5.net", "big \"G\"");
         Address utf16Name = new Address("<address6@co.jp>", "\"\u65E5\u672C\u8A9E\"");
         Address utf32Name = new Address("<address8@ne.jp>", "\uD834\uDF01\uD834\uDF46");
-        
+
         // test for internal states.
         assertEquals("no name 1 address", "noname1@dom1.com", noName1.getAddress());
         assertNull("no name 1 name", noName1.getPersonal());
@@ -462,10 +471,10 @@ public class AddressUnitTests extends AndroidTestCase {
         assertEquals("double quoted name name", "name,4", dquoteName.getPersonal());
         assertEquals("quoted name address", "bigG@dom5.net", quotedName.getAddress());
         assertEquals("quoted name name", "big \"G\"", quotedName.getPersonal());
-        assertEquals("utf-16 name address", "address6@co.jp", utf16Name.getAddress());       
-        assertEquals("utf-16 name name", "\u65E5\u672C\u8A9E", utf16Name.getPersonal());       
-        assertEquals("utf-32 name address", "address8@ne.jp", utf32Name.getAddress());       
-        assertEquals("utf-32 name name", "\uD834\uDF01\uD834\uDF46", utf32Name.getPersonal());       
+        assertEquals("utf-16 name address", "address6@co.jp", utf16Name.getAddress());
+        assertEquals("utf-16 name name", "\u65E5\u672C\u8A9E", utf16Name.getPersonal());
+        assertEquals("utf-32 name address", "address8@ne.jp", utf32Name.getAddress());
+        assertEquals("utf-32 name name", "\uD834\uDF01\uD834\uDF46", utf32Name.getPersonal());
 
         Address[] addresses = new Address[] {
                 noName1, noName2, simpleName, dquoteName, quotedName, utf16Name, utf32Name,
@@ -482,62 +491,62 @@ public class AddressUnitTests extends AndroidTestCase {
                 + "=?UTF-8?B?8J2MgfCdjYY=?= <address8@ne.jp>",
                 line);
     }
-    
+
     /**
      * Test various combinations of the toFriendly (single) method
      */
-    public void testToFriendlySingle() {        
+    public void testToFriendlySingle() {
         assertEquals("personal1", mAddress1.toFriendly());
         assertEquals("address2", mAddress2.toFriendly());
         assertEquals("address3", mAddress3.toFriendly());
     }
-    
+
     /**
      * Test various combinations of the toFriendly (array) method
      */
-    public void testToFriendlyArray() {        
+    public void testToFriendlyArray() {
         Address[] list1 = null;
         Address[] list2 = new Address[0];
         Address[] list3 = new Address[] { mAddress1 };
         Address[] list4 = new Address[] { mAddress1, mAddress2, mAddress3 };
-        
+
         assertEquals(null, Address.toFriendly(list1));
         assertEquals(null, Address.toFriendly(list2));
         assertEquals("personal1", Address.toFriendly(list3));
         assertEquals("personal1,address2,address3", Address.toFriendly(list4));
     }
-    
+
     /**
      * Simple quick checks of empty-input edge conditions for pack()
-     * 
+     *
      * NOTE:  This is not a claim that these edge cases are "correct", only to maintain consistent
      * behavior while I am changing some of the code in the function under test.
      */
     public void testEmptyPack() {
         String result;
-        
+
         // null input => null string
         result = Address.pack(null);
         assertNull("packing null", result);
-        
+
         // zero-length input => empty string
         result = Address.pack(new Address[] { });
         assertEquals("packing empty array", "", result);
     }
-    
+
     /**
      * Simple quick checks of empty-input edge conditions for unpack()
-     * 
+     *
      * NOTE:  This is not a claim that these edge cases are "correct", only to maintain consistent
      * behavior while I am changing some of the code in the function under test.
      */
     public void testEmptyUnpack() {
         Address[] result;
-        
+
         // null input => empty array
         result = Address.unpack(null);
         assertTrue("unpacking null address", result != null && result.length == 0);
-        
+
         // empty string input => empty array
         result = Address.unpack("");
         assertTrue("unpacking zero-length", result != null && result.length == 0);
@@ -642,7 +651,7 @@ public class AddressUnitTests extends AndroidTestCase {
         for (String address : valid) {
             assertTrue(address, Address.isValidAddress(address));
         }
-        
+
         // isAllValid() must accept empty address list as valid
         assertTrue("Empty address list is valid", Address.isAllValid(""));
     }