diff --git a/application/src/org/yaaic/model/Message.java b/application/src/org/yaaic/model/Message.java
index 098f243..0ba3dad 100644
--- a/application/src/org/yaaic/model/Message.java
+++ b/application/src/org/yaaic/model/Message.java
@@ -78,7 +78,7 @@ public class Message
     private final String text;
     private final String sender;
     private SpannableString canvas;
-    private final long timestamp;
+    private long timestamp;
 
     private int color = NO_COLOR;
     private int type  = NO_ICON;
@@ -177,6 +177,17 @@ public class Message
     {
         this.color = color;
     }
+
+    /**
+     * Set the timestamp of the message
+     *
+     * @param timestamp
+     */
+    public void setTimestamp(long timestamp)
+    {
+        this.timestamp = timestamp;
+    }
+
     /**
      * Associate a color with a sender name
      *
@@ -296,7 +307,7 @@ public class Message
      * @param use24hFormat
      * @return
      */
-    private String renderTimeStamp(boolean use24hFormat)
+    public String renderTimeStamp(boolean use24hFormat)
     {
         Date date = new Date(timestamp);
 
diff --git a/test/src/org/yaaic/test/model/MessageTest.java b/test/src/org/yaaic/test/model/MessageTest.java
index 473fe49..bb8036e 100644
--- a/test/src/org/yaaic/test/model/MessageTest.java
+++ b/test/src/org/yaaic/test/model/MessageTest.java
@@ -58,14 +58,16 @@ public class MessageTest extends TestCase
 	
 	public void testTimestamp()
 	{
-		String timestamp1 = Message.generateTimestamp(1270505773862l, false);
-		assertEquals("[00:16] ", timestamp1);
-		String timestamp2 = Message.generateTimestamp(1270505773862l, true);
-		assertEquals("[00:16] ", timestamp2);
+		Message message = new Message("");
 
-		String timestamp3 = Message.generateTimestamp(1270908275000l, false);
-		assertEquals("[04:04] ", timestamp3);
-		String timestamp4 = Message.generateTimestamp(1270908275000l, true);
-		assertEquals("[16:04] ", timestamp4);
+		message.setTimestamp(1270505773862l);
+
+		assertEquals("[00:16] ", message.renderTimeStamp(false));
+		assertEquals("[00:16] ", message.renderTimeStamp(true));
+
+		message.setTimestamp(1270908275000l);
+
+		assertEquals("[04:04] ", message.renderTimeStamp(false));
+		assertEquals("[16:04] ", message.renderTimeStamp(true));
 	}
 }
diff --git a/test/src/org/yaaic/test/scenario/ConnectionScenarios.java b/test/src/org/yaaic/test/scenario/ConnectionScenarios.java
index f6e81a7..dcf828e 100644
--- a/test/src/org/yaaic/test/scenario/ConnectionScenarios.java
+++ b/test/src/org/yaaic/test/scenario/ConnectionScenarios.java
@@ -95,7 +95,7 @@ public class ConnectionScenarios extends ActivityInstrumentationTestCase2
 		solo.enterText(0, "/j #yaaic-test");
 		solo.sendKey(Solo.ENTER);
 		
-		solo.sleep(1000);
+		solo.sleep(1500);
 
 		// Assert channel joined
 		assertTrue(solo.searchText("#yaaic-test"));