diff --git a/res/drawable/splashscreen.png b/res/drawable/splashscreen.png
new file mode 100644
index 000000000..6c567e2c4
Binary files /dev/null and b/res/drawable/splashscreen.png differ
diff --git a/res/drawable/text_color_setup_next.xml b/res/drawable/text_color_setup_next.xml
deleted file mode 100644
index 14bf31b9c..000000000
--- a/res/drawable/text_color_setup_next.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
- <selector xmlns:android="http://schemas.android.com/apk/res/android">
-     <item android:state_pressed="true"
-           android:color="@color/text_over" />
-     <item android:state_enabled="false"
-           android:color="@color/text_default" /> 
-     <item android:color="@color/text_selected" />
- </selector>
\ No newline at end of file
diff --git a/res/layout/launcher.xml b/res/layout/launcher.xml
index 2e7387210..41a8c196b 100644
--- a/res/layout/launcher.xml
+++ b/res/layout/launcher.xml
@@ -1,9 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout
-  xmlns:android="http://schemas.android.com/apk/res/android"
-  android:layout_width="fill_parent"
-  android:layout_height="fill_parent">
-  	<ImageView android:layout_width="fill_parent" android:layout_height="fill_parent"
-  	    android:src="@drawable/logo_linphone_57x57" android:scaleType="fitXY" />
-    <ProgressBar android:layout_height="wrap_content" android:layout_width="wrap_content" />
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent">
+	
+  	<ImageView 
+  	    android:layout_width="match_parent" 
+  	    android:layout_height="match_parent"
+  	    android:src="@drawable/splashscreen" 
+  	    android:scaleType="fitXY" />
+  	
+    <ProgressBar 
+        android:layout_height="wrap_content" 
+        android:layout_width="wrap_content" />
+    
 </FrameLayout>
diff --git a/src/org/linphone/ChatFragment.java b/src/org/linphone/ChatFragment.java
index 708671c12..2bc633fff 100644
--- a/src/org/linphone/ChatFragment.java
+++ b/src/org/linphone/ChatFragment.java
@@ -570,8 +570,9 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
         if (requestCode == ADD_PHOTO && resultCode == Activity.RESULT_OK) {
     		final String filePath = getRealPathFromURI(data.getData());
         	showPopupMenuAskingImageSize(filePath);
+		} else {
+			super.onActivityResult(requestCode, resultCode, data);
 		}
-        super.onActivityResult(requestCode, resultCode, data);
     }
 	
 	class ProgressOutputStream extends OutputStream {