diff --git a/res/drawable/error.png b/res/drawable/error.png
new file mode 100644
index 0000000..419dede
Binary files /dev/null and b/res/drawable/error.png differ
diff --git a/src/org/yaaic/view/ConversationActivity.java b/src/org/yaaic/view/ConversationActivity.java
index e6eaf14..dfe9770 100644
--- a/src/org/yaaic/view/ConversationActivity.java
+++ b/src/org/yaaic/view/ConversationActivity.java
@@ -343,6 +343,14 @@ public class ConversationActivity extends Activity implements ServiceConnection,
 	public boolean onKey(View view, int keyCode, KeyEvent event)
 	{
 		if (keyCode == KeyEvent.KEYCODE_ENTER && event.getAction() == KeyEvent.ACTION_UP) {
+			if (!server.isConnected()) {
+				Message message = new Message("Not connected");
+				message.setColor(Message.COLOR_RED);
+				message.setIcon(R.drawable.error);
+				server.getConversation(server.getSelectedConversation()).addMessage(message);
+				onConversationMessage(server.getSelectedConversation());
+			}
+			
 			EditText input = (EditText) view;
 			String text = input.getText().toString();
 			input.setText("");