diff --git a/src/org/linphone/ChatFragment.java b/src/org/linphone/ChatFragment.java
index 54ea5f3eb..412df96c7 100644
--- a/src/org/linphone/ChatFragment.java
+++ b/src/org/linphone/ChatFragment.java
@@ -66,7 +66,6 @@ import android.text.Editable;
 import android.text.InputType;
 import android.text.TextWatcher;
 import android.view.ContextMenu;
-import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
@@ -467,6 +466,10 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
 
 		onSaveInstanceState(getArguments());
 
+		uploadLayout.setVisibility(View.GONE);
+		textLayout.setVisibility(View.VISIBLE);
+		progressBar.setProgress(0);
+
 		//Hide keybord
 		InputMethodManager imm = (InputMethodManager)getActivity().getSystemService(Context.INPUT_METHOD_SERVICE);
 		imm.hideSoftInputFromWindow(message.getWindowToken(), 0);
@@ -519,7 +522,6 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
 
 		remoteComposing.setVisibility(chatRoom.isRemoteComposing() ? View.VISIBLE : View.GONE);
 		dispayMessageList();
-
 		super.onResume();
 	}
 
diff --git a/src/org/linphone/LinphoneManager.java b/src/org/linphone/LinphoneManager.java
index 4450add06..65515b557 100644
--- a/src/org/linphone/LinphoneManager.java
+++ b/src/org/linphone/LinphoneManager.java
@@ -279,7 +279,7 @@ public class LinphoneManager implements LinphoneCoreListener, LinphoneChatMessag
 
 	@Override
 	public void onLinphoneChatMessageStateChanged(LinphoneChatMessage msg, LinphoneChatMessage.State state) {
-		if (state == LinphoneChatMessage.State.FileTransferDone) {
+		if (state == LinphoneChatMessage.State.FileTransferDone || state == LinphoneChatMessage.State.FileTransferError) {
 			if(msg.isOutgoing() && mUploadingImageStream != null){
 				mUploadPendingFileMessage = null;
 				mUploadingImageStream = null;
diff --git a/src/org/linphone/StatusFragment.java b/src/org/linphone/StatusFragment.java
index 584f3c491..c2e1d6059 100644
--- a/src/org/linphone/StatusFragment.java
+++ b/src/org/linphone/StatusFragment.java
@@ -119,10 +119,14 @@ public class StatusFragment extends Fragment {
 				if (!isAttached || !LinphoneService.isReady()) {
 					return;
 				}
-						if (lc.getDefaultProxyConfig().equals(proxy)) {
-							statusLed.setImageResource(getStatusIconResource(state, true));
-							statusText.setText(getStatusIconText(state));
-						}
+
+				if (lc.getDefaultProxyConfig() != null && lc.getDefaultProxyConfig().equals(proxy)) {
+					statusLed.setImageResource(getStatusIconResource(state, true));
+					statusText.setText(getStatusIconText(state));
+				} else if(lc.getDefaultProxyConfig() == null) {
+					statusLed.setImageResource(getStatusIconResource(state, true));
+					statusText.setText(getStatusIconText(state));
+				}
 				
 				try {
 					if (getResources().getBoolean(R.bool.lock_statusbar)) {