diff --git a/res/layout/chat_bubble_alt_incoming.xml b/res/layout/chat_bubble_alt_incoming.xml
index b0f74659c..2369f271a 100644
--- a/res/layout/chat_bubble_alt_incoming.xml
+++ b/res/layout/chat_bubble_alt_incoming.xml
@@ -26,6 +26,14 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_weight="1" />
+    
+    <ProgressBar 
+        android:id="@+id/spinner"
+        android:visibility="gone"
+        android:indeterminate="true"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_weight="1" />
 
     <TextView 
         android:id="@+id/time"
diff --git a/res/layout/chat_bubble_incoming.xml b/res/layout/chat_bubble_incoming.xml
index a9bc6ba96..7b31a49ae 100644
--- a/res/layout/chat_bubble_incoming.xml
+++ b/res/layout/chat_bubble_incoming.xml
@@ -25,6 +25,13 @@
         android:text="@string/download_image"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content" />
+    
+    <ProgressBar 
+        android:id="@+id/spinner"
+        android:visibility="gone"
+        android:indeterminate="true"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content" />
 
     <TextView 
         android:id="@+id/time"
diff --git a/src/org/linphone/ChatFragment.java b/src/org/linphone/ChatFragment.java
index 436eaa34a..c3d983bae 100644
--- a/src/org/linphone/ChatFragment.java
+++ b/src/org/linphone/ChatFragment.java
@@ -412,6 +412,9 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
 			bubble.setShowOrDownloadImageButtonListener(new OnClickListener() {
 				@Override
 				public void onClick(View view) {
+					v.findViewById(R.id.spinner).setVisibility(View.VISIBLE);
+					v.findViewById(R.id.download).setVisibility(View.GONE);
+					
 					new Thread(new Runnable() {
 						@Override
 						public void run() {
@@ -428,13 +431,15 @@ public class ChatFragment extends Fragment implements OnClickListener, LinphoneC
 									public void run() {
 										((ImageView)v.findViewById(R.id.image)).setImageBitmap(bm);
 										v.findViewById(R.id.image).setVisibility(View.VISIBLE);
-										v.findViewById(R.id.download).setVisibility(View.GONE);
+										v.findViewById(R.id.spinner).setVisibility(View.GONE);
 									}
 								});
 							} else {
 								mHandler.post(new Runnable() {
 									@Override
 									public void run() {
+										v.findViewById(R.id.spinner).setVisibility(View.GONE);
+										v.findViewById(R.id.download).setVisibility(View.VISIBLE);
 										LinphoneActivity.instance().displayCustomToast(getString(R.string.download_image_failed), Toast.LENGTH_LONG);
 									}
 								});