diff --git a/res/layout/chat_bubble_alt_outgoing.xml b/res/layout/chat_bubble_alt_outgoing.xml
index 37583206a..4792a5474 100644
--- a/res/layout/chat_bubble_alt_outgoing.xml
+++ b/res/layout/chat_bubble_alt_outgoing.xml
@@ -37,4 +37,11 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content" />
     
+    <Button
+        android:id="@+id/download"
+        android:text="@string/download_image"
+        android:visibility="gone"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
+    
 </LinearLayout>
\ No newline at end of file
diff --git a/res/layout/chat_bubble_outgoing.xml b/res/layout/chat_bubble_outgoing.xml
index 9efe2d7c4..0e97114ce 100644
--- a/res/layout/chat_bubble_outgoing.xml
+++ b/res/layout/chat_bubble_outgoing.xml
@@ -20,6 +20,13 @@
         android:adjustViewBounds="true"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content" />
+    
+    <Button
+        android:id="@+id/download"
+        android:visibility="gone"
+        android:text="@string/download_image"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
 
     <LinearLayout
 	    android:layout_width="wrap_content"
diff --git a/src/org/linphone/ChatFragment.java b/src/org/linphone/ChatFragment.java
index 5744320b6..9112c9e5b 100644
--- a/src/org/linphone/ChatFragment.java
+++ b/src/org/linphone/ChatFragment.java
@@ -796,7 +796,12 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
 				//Update url path in liblinphone database
 				if (message == null) {
 					LinphoneChatMessage[] history = chatRoom.getHistory();
-					message = history[id-1];
+					for (LinphoneChatMessage msg : history) {
+						if (msg.getStorageId() == id) {
+							message = msg;
+							break;
+						}
+					}
 				}
 				message.setExternalBodyUrl(path + filename);
 				chatRoom.updateUrl(message);
diff --git a/src/org/linphone/ChatStorage.java b/src/org/linphone/ChatStorage.java
index 2bc8c0e00..3da666517 100644
--- a/src/org/linphone/ChatStorage.java
+++ b/src/org/linphone/ChatStorage.java
@@ -67,7 +67,7 @@ public class ChatStorage {
 	private ChatStorage(Context c) {
 	    context = c;
 	    boolean useLinphoneStorage = c.getResources().getBoolean(R.bool.use_linphone_chat_storage);
-		SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(LinphoneActivity.instance());
+		SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(LinphoneService.instance());
 		boolean updateNeeded = prefs.getBoolean(c.getString(R.string.pref_first_time_linphone_chat_storage), true);
 	    useNativeAPI = useLinphoneStorage && !updateNeeded;
 	    Log.d("Using native API: " + useNativeAPI);
diff --git a/src/org/linphone/KeepAliveHandler.java b/src/org/linphone/KeepAliveHandler.java
index bc34b284d..4aca33c7d 100644
--- a/src/org/linphone/KeepAliveHandler.java
+++ b/src/org/linphone/KeepAliveHandler.java
@@ -29,7 +29,7 @@ public class KeepAliveHandler extends BroadcastReceiver {
 	@Override
 	public void onReceive(Context context, Intent intent) {
 		Log.i("Keep alive handler invoked");
-		if (LinphoneManager.getLcIfManagerNotDestroyedOrNull()!=null) {
+		if (LinphoneManager.getLcIfManagerNotDestroyedOrNull() != null) {
 			//first refresh registers
 			LinphoneManager.getLc().refreshRegisters();
 			//make sure iterate will have enough time, device will not sleep until exit from this method
diff --git a/src/org/linphone/ui/BubbleChat.java b/src/org/linphone/ui/BubbleChat.java
index 5e064ae19..a154145de 100644
--- a/src/org/linphone/ui/BubbleChat.java
+++ b/src/org/linphone/ui/BubbleChat.java
@@ -87,7 +87,7 @@ public class BubbleChat {
 	
 	private RelativeLayout view;
 	private ImageView statusView;
-	private Button download;
+	private Button downloadOrShow;
 	
 	public BubbleChat(final Context context, int id, String message, Bitmap image, long time, boolean isIncoming, LinphoneChatMessage.State status, final String url, int previousID) {
 		view = new RelativeLayout(context);
@@ -162,9 +162,9 @@ public class BubbleChat {
 	    		});
 	    	}
 	    	
-	    	download = (Button) layout.findViewById(R.id.download);
-	    	if (download != null && image == null && message == null) {
-	    		download.setVisibility(View.VISIBLE);
+	    	downloadOrShow = (Button) layout.findViewById(R.id.download);
+	    	if (downloadOrShow != null && image == null && message == null) {
+	    		downloadOrShow.setVisibility(View.VISIBLE);
 	    	}
 	    	
 	    	TextView timeView = (TextView) layout.findViewById(R.id.time);
@@ -282,14 +282,14 @@ public class BubbleChat {
 	}
 
 	public void setShowOrDownloadImageButtonListener(OnClickListener onClickListener) {
-		if (download != null) {
-			download.setOnClickListener(onClickListener);
+		if (downloadOrShow != null) {
+			downloadOrShow.setOnClickListener(onClickListener);
 		}
 	}
 	
 	public void setShowOrDownloadText(String buttonName) {
-		if (download != null) {
-			download.setText(buttonName);
+		if (downloadOrShow != null) {
+			downloadOrShow.setText(buttonName);
 		}
 	}
 }