diff --git a/src/org/yaaic/activity/ConversationActivity.java b/src/org/yaaic/activity/ConversationActivity.java
index ebb8bb2..d54f142 100644
--- a/src/org/yaaic/activity/ConversationActivity.java
+++ b/src/org/yaaic/activity/ConversationActivity.java
@@ -176,6 +176,7 @@ public class ConversationActivity extends Activity implements ServiceConnection,
 			
 			if (mAdapter != null) {
 				mAdapter.addBulkMessages(conversation.getBuffer());
+				conversation.clearBuffer();
 			}
 		}
 		
diff --git a/src/org/yaaic/adapter/MessageListAdapter.java b/src/org/yaaic/adapter/MessageListAdapter.java
index d6907e7..c5e570a 100644
--- a/src/org/yaaic/adapter/MessageListAdapter.java
+++ b/src/org/yaaic/adapter/MessageListAdapter.java
@@ -101,7 +101,7 @@ public class MessageListAdapter extends BaseAdapter
 		Context mContext = this.context;
 		int mSize = messages.size();
 		
-		for (int i = 0; i < mSize; i++) {
+		for (int i = mSize - 1; i > -1; i--) {
 			mMessages.add(messages.get(i).renderTextView(mContext));
 			
 			if (mMessages.size() > Conversation.HISTORY_SIZE) {