--- a/res/layout/sendim.xml	Mon Apr 13 16:32:18 2009 +0200
+++ b/res/layout/sendim.xml	Tue Apr 14 18:54:10 2009 +0200
@@ -15,7 +15,8 @@
 		
     	<ImageView android:id="@+id/sendimavatar"
     		android:layout_width="wrap_content"
-			android:src="@drawable/avatar" android:layout_height="20px"/>
+    		android:layout_height="wrap_content"
+			android:src="@drawable/avatar"/>
         
         <TextView android:id="@+id/sendimlogin"
         	android:layout_width="wrap_content"

--- a/res/values/strings.xml	Mon Apr 13 16:32:18 2009 +0200
+++ b/res/values/strings.xml	Tue Apr 14 18:54:10 2009 +0200
@@ -34,5 +34,6 @@
 	<string name="SendIMFrom">and is speaking from : </string>
 	<string name="SendIMSmiley">Insert a smiley</string>
 	<string name="SendIMLoginHint">login</string>
+	<string name="SendIMNoStatusSet">No status set</string>
 
 </resources>

--- a/src/com/beem/project/beem/ui/SendIM.java	Mon Apr 13 16:32:18 2009 +0200
+++ b/src/com/beem/project/beem/ui/SendIM.java	Tue Apr 14 18:54:10 2009 +0200
@@ -52,6 +52,7 @@
     private IMessageListener mMessageListener;
     private IChat mChat;
     private Drawable mAvatar;
+    private TextView mLogin;
 
     /**
      * Constructor.
@@ -75,18 +76,28 @@
 	mToSend = (EditText) findViewById(R.id.userText);
 	mSet = getSharedPreferences("lol", MODE_PRIVATE);
 	mSmyDialog = new SendIMDialogSmiley(this, mSet);
-	mGlobalSettings = getSharedPreferences(getString(R.string.PreferenceFileName), MODE_PRIVATE);
+	mGlobalSettings = getSharedPreferences(
+		getString(R.string.PreferenceFileName), MODE_PRIVATE);
 	mAdapter = new ArrayAdapter<String>(this, R.layout.messagelist,
 		mMessages);
 	setListAdapter(mAdapter);
 
 	mToSend.setOnClickListener(this);
 	mToSend.setOnKeyListener(this);
-
+	
 	mContact = getIntent().getParcelableExtra("contact");
-	TextView login = (TextView) findViewById(R.id.sendimlogin);
-	login.setText(mContact.getJID());
-	
+	setViewHeader();
+    }
+    
+    private void setViewHeader()
+    {
+	mLogin = (TextView) findViewById(R.id.sendimlogin);
+	String status = mContact.getMsgState();
+	if (status == null)
+	    status = getString(R.string.SendIMNoStatusSet);
+	else
+	    status = mContact.getMsgState();
+	mLogin.setText(mContact.getJID() + "\n" + status);
     }
 
     @Override
@@ -118,7 +129,8 @@
      */
     private void sendText() {
 	String text = mToSend.getText().toString();
-	String from = mGlobalSettings.getString(getString(R.string.PreferenceJID), "You");
+	String from = mGlobalSettings.getString(
+		getString(R.string.PreferenceJID), "You");
 	if (!text.equals("")) {
 	    Message msg = new Message(mContact.getJID(), Message.MSG_TYPE_CHAT);
 	    msg.setBody(text);
@@ -129,7 +141,6 @@
 		e.printStackTrace();
 	    }
 	    mAdapter.add(from + getString(R.string.SendIMSays) + text);
-	    mToSend.setText(null);
 	}
     }
 
@@ -173,18 +184,18 @@
 		return false;
 	}
     }
-    
+
     private class OnChatListener extends IChatManagerListener.Stub {
 
 	@Override
 	public void chatCreated(IChat chat, boolean locally)
 		throws RemoteException {
 	    Log.i("LOG", "chatCreated");
-	    
+
 	}
-	
+
     }
-    
+
     private class OnMessageListener extends IMessageListener.Stub {
 
 	@Override
@@ -194,6 +205,5 @@
 	    mAdapter.add(mContact.getJID() + " "
 		    + getString(R.string.SendIMSays) + msg.getBody());
 	}
-	
     }
 }