diff --git a/.DS_Store b/.DS_Store
index fb4cdad..7e3b286 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/bin/TweetView.apk b/bin/TweetView.apk
index 651867a..672cc19 100644
Binary files a/bin/TweetView.apk and b/bin/TweetView.apk differ
diff --git a/bin/classes.dex b/bin/classes.dex
index 5a03649..9a39dfb 100644
Binary files a/bin/classes.dex and b/bin/classes.dex differ
diff --git a/bin/com/example/Example.class b/bin/com/example/Example.class
index 5cf4991..7eac412 100644
Binary files a/bin/com/example/Example.class and b/bin/com/example/Example.class differ
diff --git a/bin/com/example/ImageManager$BitmapDisplayer.class b/bin/com/example/ImageManager$BitmapDisplayer.class
index 5664624..f26ce37 100644
Binary files a/bin/com/example/ImageManager$BitmapDisplayer.class and b/bin/com/example/ImageManager$BitmapDisplayer.class differ
diff --git a/bin/com/example/ImageManager$ImageQueue.class b/bin/com/example/ImageManager$ImageQueue.class
index 860bfd0..9786a22 100644
Binary files a/bin/com/example/ImageManager$ImageQueue.class and b/bin/com/example/ImageManager$ImageQueue.class differ
diff --git a/bin/com/example/ImageManager$ImageQueueManager.class b/bin/com/example/ImageManager$ImageQueueManager.class
index 5d87801..99073f0 100644
Binary files a/bin/com/example/ImageManager$ImageQueueManager.class and b/bin/com/example/ImageManager$ImageQueueManager.class differ
diff --git a/bin/com/example/ImageManager$ImageRef.class b/bin/com/example/ImageManager$ImageRef.class
index 54fecd9..fadebc6 100644
Binary files a/bin/com/example/ImageManager$ImageRef.class and b/bin/com/example/ImageManager$ImageRef.class differ
diff --git a/bin/com/example/ImageManager.class b/bin/com/example/ImageManager.class
index 50277a4..2c86d04 100644
Binary files a/bin/com/example/ImageManager.class and b/bin/com/example/ImageManager.class differ
diff --git a/bin/com/example/R$id.class b/bin/com/example/R$id.class
index 745da2f..0f7719c 100644
Binary files a/bin/com/example/R$id.class and b/bin/com/example/R$id.class differ
diff --git a/bin/com/example/R$layout.class b/bin/com/example/R$layout.class
index 0a8b742..a9acf7b 100644
Binary files a/bin/com/example/R$layout.class and b/bin/com/example/R$layout.class differ
diff --git a/bin/com/example/R$string.class b/bin/com/example/R$string.class
index 7603828..4143709 100644
Binary files a/bin/com/example/R$string.class and b/bin/com/example/R$string.class differ
diff --git a/bin/com/example/TweetItemAdapter$ViewHolder.class b/bin/com/example/TweetItemAdapter$ViewHolder.class
index c7f2434..1accbbe 100644
Binary files a/bin/com/example/TweetItemAdapter$ViewHolder.class and b/bin/com/example/TweetItemAdapter$ViewHolder.class differ
diff --git a/bin/com/example/TweetItemAdapter.class b/bin/com/example/TweetItemAdapter.class
index 6865ec9..cb994d3 100644
Binary files a/bin/com/example/TweetItemAdapter.class and b/bin/com/example/TweetItemAdapter.class differ
diff --git a/bin/resources.ap_ b/bin/resources.ap_
index cd7a659..6e87b02 100644
Binary files a/bin/resources.ap_ and b/bin/resources.ap_ differ
diff --git a/gen/com/example/R.java b/gen/com/example/R.java
index c064515..a5186f7 100644
--- a/gen/com/example/R.java
+++ b/gen/com/example/R.java
@@ -14,10 +14,11 @@ public static final class drawable {
         public static final int icon=0x7f020000;
     }
     public static final class id {
-        public static final int ListViewId=0x7f050003;
+        public static final int ListViewId=0x7f050004;
         public static final int avatar=0x7f050000;
-        public static final int message=0x7f050002;
-        public static final int username=0x7f050001;
+        public static final int message=0x7f050003;
+        public static final int progress_bar=0x7f050001;
+        public static final int username=0x7f050002;
     }
     public static final class layout {
         public static final int listitem=0x7f030000;
diff --git a/res/layout/listitem.xml b/res/layout/listitem.xml
index 3dff3bc..38f95e9 100644
--- a/res/layout/listitem.xml
+++ b/res/layout/listitem.xml
@@ -7,12 +7,29 @@
 	android:paddingTop="5px" 
 	android:paddingLeft="5px">
 	
-	<ImageView
+    <RelativeLayout
+    	android:layout_width="wrap_content"
+	    android:layout_height="fill_parent">
+	    
+	    <ImageView
+	    android:layout_centerVertical="true"
         android:id="@+id/avatar"
         android:layout_width="wrap_content"
         android:layout_height="fill_parent"
         android:layout_marginRight="6dip"
-        android:src="@drawable/icon" />
+        android:visibility="gone" />	    
+        <ProgressBar
+        android:layout_centerVertical="true"
+    	android:id="@+id/progress_bar" 	
+		android:layout_width="wrap_content" 
+		android:layout_height="wrap_content"
+		android:maxWidth="30dip"
+		android:minWidth="30dip"
+		android:maxHeight="30dip"
+		android:minHeight="30dip"
+        android:layout_marginRight="6dip"
+		android:indeterminate="true" />
+	</RelativeLayout>
     <LinearLayout
         android:orientation="vertical"
         android:layout_width="0dip"
diff --git a/src/com/example/ImageManager.java b/src/com/example/ImageManager.java
index c22d65e..eb1d019 100644
--- a/src/com/example/ImageManager.java
+++ b/src/com/example/ImageManager.java
@@ -10,7 +10,9 @@
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
+import android.view.View;
 import android.widget.ImageView;
+import android.widget.ProgressBar;
 
 public class ImageManager {
 	
@@ -39,20 +41,25 @@ public ImageManager(Context context) {
 			cacheDir.mkdirs();
 	}
 	   
-	public void displayImage(String url, Activity activity, ImageView imageView) {
-		if(imageMap.containsKey(url))
+	public void displayImage(String url, Activity activity, ImageView imageView, ProgressBar progressBar) {
+		if(imageMap.containsKey(url)) {
 			imageView.setImageBitmap(imageMap.get(url));
+			progressBar.setVisibility(View.GONE); //ADDED
+			imageView.setVisibility(View.VISIBLE); //ADDED
+		}
 		else {
-			queueImage(url, activity, imageView);
-			imageView.setImageResource(R.drawable.icon);
+			queueImage(url, activity, imageView, progressBar);
+			//imageView.setImageResource(R.drawable.icon);
+			imageView.setVisibility(View.GONE); //ADDED
+			progressBar.setVisibility(View.VISIBLE); //ADDED
 		}
 	}
 
-	private void queueImage(String url, Activity activity, ImageView imageView) {
+	private void queueImage(String url, Activity activity, ImageView imageView, ProgressBar progressBar) {
 		// This ImageView might have been used for other images, so we clear 
 		// the queue of old tasks before starting.
 		imageQueue.Clean(imageView);
-		ImageRef p=new ImageRef(url, imageView);
+		ImageRef p=new ImageRef(url, imageView, progressBar);
 
 		synchronized(imageQueue.imageRefs) {
 			imageQueue.imageRefs.push(p);
@@ -105,10 +112,12 @@ private void writeFile(Bitmap bmp, File f) {
 	private class ImageRef {
 		public String url;
 		public ImageView imageView;
+		public ProgressBar progressBar;
 		
-		public ImageRef(String u, ImageView i) {
-			url=u;
-			imageView=i;
+		public ImageRef(String u, ImageView i, ProgressBar p) {
+			url = u;
+			imageView = i;
+			progressBar = p;
 		}
 	}
 	
@@ -156,7 +165,7 @@ public void run() {
 						// Make sure we have the right view - thread safety defender
 						if(tag != null && ((String)tag).equals(imageToLoad.url)) {
 							BitmapDisplayer bmpDisplayer = 
-								new BitmapDisplayer(bmp, imageToLoad.imageView);
+								new BitmapDisplayer(bmp, imageToLoad.imageView, imageToLoad.progressBar);
 							
 							Activity a = 
 								(Activity)imageToLoad.imageView.getContext();
@@ -176,17 +185,24 @@ public void run() {
 	private class BitmapDisplayer implements Runnable {
 		Bitmap bitmap;
 		ImageView imageView;
+		ProgressBar progressBar;
 		
-		public BitmapDisplayer(Bitmap b, ImageView i) {
-			bitmap=b;
-			imageView=i;
+		public BitmapDisplayer(Bitmap b, ImageView i, ProgressBar p) {
+			bitmap = b;
+			imageView = i;
+			progressBar = p;
 		}
 		
 		public void run() {
-			if(bitmap != null)
+			if(bitmap != null) {
 				imageView.setImageBitmap(bitmap);
-			else
-				imageView.setImageResource(R.drawable.icon);
+				progressBar.setVisibility(View.GONE); //ADDED
+				imageView.setVisibility(View.VISIBLE); //ADDED
+			}
+			else {
+				imageView.setVisibility(View.GONE); //ADDED
+				progressBar.setVisibility(View.VISIBLE); //ADDED
+			}
 		}
 	}
 }
\ No newline at end of file
diff --git a/src/com/example/TweetItemAdapter.java b/src/com/example/TweetItemAdapter.java
index 6c7e7cc..edfe01d 100644
--- a/src/com/example/TweetItemAdapter.java
+++ b/src/com/example/TweetItemAdapter.java
@@ -11,6 +11,7 @@
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 import android.widget.ImageView;
+import android.widget.ProgressBar;
 import android.widget.TextView;
 
 public class TweetItemAdapter extends ArrayAdapter<Tweet> {
@@ -31,6 +32,7 @@ public static class ViewHolder{
 		public TextView username;
 		public TextView message;
 		public ImageView image;
+		public ProgressBar progress; //ADDED
 	}
 
 	@Override
@@ -45,6 +47,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
 			holder.username = (TextView) v.findViewById(R.id.username);
 			holder.message = (TextView) v.findViewById(R.id.message);
 			holder.image = (ImageView) v.findViewById(R.id.avatar);
+			holder.progress = (ProgressBar) v.findViewById(R.id.progress_bar); //ADDED
 			v.setTag(holder);
 		}
 		else
@@ -55,7 +58,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
 			holder.username.setText(tweet.username);
 			holder.message.setText(tweet.message);
 			holder.image.setTag(tweet.image_url);
-			imageManager.displayImage(tweet.image_url, activity, holder.image);
+			imageManager.displayImage(tweet.image_url, activity, holder.image, holder.progress); //CHANGED
 		}
 		return v;
 	}