diff --git a/android/BOINC/res/layout/msgs_layout.xml b/android/BOINC/res/layout/msgs_layout.xml
index 53556092f6..1cacc16993 100644
--- a/android/BOINC/res/layout/msgs_layout.xml
+++ b/android/BOINC/res/layout/msgs_layout.xml
@@ -22,11 +22,11 @@
     android:layout_height="match_parent"
     android:orientation="vertical" >
 
-    <ListView
+    <TableLayout
         android:id="@+id/msgsList"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" >
+        android:layout_height="wrap_content" >
 
-    </ListView>
+    </TableLayout>
 
 </LinearLayout>
diff --git a/android/BOINC/res/layout/msgs_layout_listitem.xml b/android/BOINC/res/layout/msgs_layout_listitem.xml
index 9d0dc8cf83..16a3848b51 100644
--- a/android/BOINC/res/layout/msgs_layout_listitem.xml
+++ b/android/BOINC/res/layout/msgs_layout_listitem.xml
@@ -23,25 +23,33 @@
     android:layout_height="match_parent"
     android:orientation="horizontal" >
 
-    <TextView
-        android:id="@+id/msgs_project"
-        android:layout_width="wrap_content"
+    <TableRow
+        android:id="@+id/msgs_row"
+        android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:layout_margin="2dp"
-        android:text="Project" />
+        android:orientation="horizontal" >
 
-    <TextView
-        android:id="@+id/msgs_date"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_margin="2dp"
-        android:text="Date" />
+        <TextView
+            android:id="@+id/msgs_project"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="2dp"
+            android:text="Project" />
 
-    <TextView
-        android:id="@+id/msgs_message"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_margin="2dp"
-        android:text="Message" />
+        <TextView
+            android:id="@+id/msgs_date"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_margin="2dp"
+            android:text="Date" />
+
+        <TextView
+            android:id="@+id/msgs_message"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:layout_margin="2dp"
+            android:text="Message" />
+
+    </TableRow>
 
 </TableRow>
\ No newline at end of file
diff --git a/android/BOINC/src/edu/berkeley/boinc/adapter/MessagesListAdapter.java b/android/BOINC/src/edu/berkeley/boinc/adapter/MessagesListAdapter.java
index 8165fbf8db..5560fb4689 100644
--- a/android/BOINC/src/edu/berkeley/boinc/adapter/MessagesListAdapter.java
+++ b/android/BOINC/src/edu/berkeley/boinc/adapter/MessagesListAdapter.java
@@ -58,7 +58,7 @@ public class MessagesListAdapter extends ArrayAdapter<Message>{
     	
 		// Construct output
 		String project = listItem.project;
-		String date = new Date(listItem.timestamp/1000).toString();
+		String date = new Date(listItem.timestamp).toString();
 		String message = listItem.body;
 
         // Instantiate layout elements