diff --git a/src/org/yaaic/model/Channel.java b/src/org/yaaic/model/Channel.java
index 1802986..29de450 100644
--- a/src/org/yaaic/model/Channel.java
+++ b/src/org/yaaic/model/Channel.java
@@ -93,7 +93,9 @@ public class Channel
 	 */
 	public Message pollBufferedMessage()
 	{
-		return buffer.poll();
+		Message message = buffer.getLast();
+		buffer.removeLast();
+		return message;
 	}
 	
 	/**