--- a/engine/src/FeedEngine.cpp	Wed Mar 31 16:06:20 2010 +0200
+++ b/engine/src/FeedEngine.cpp	Wed Mar 31 18:09:02 2010 +0200
@@ -277,11 +277,18 @@
 	
 	// complete file path is base dir + rel path
 	filePath.Append(relPath);
-	aFeedInfo->SetImageFileNameL(filePath);
-
-	if(iFeedClient->GetL(aFeedInfo->ImageUrl(), filePath, ETrue))
+	// This file might exist in the podcast directory already so check this first
+	if(BaflUtils::FileExists(iPodcastModel.FsSession(), filePath))
 		{
-			iClientState = EUpdatingImage;
+			aFeedInfo->SetImageFileNameL(filePath, &iPodcastModel);
+		}
+	else
+		{
+			aFeedInfo->SetImageFileNameL(filePath, NULL);
+			if(iFeedClient->GetL(aFeedInfo->ImageUrl(), filePath, ETrue))
+			{
+				iClientState = EUpdatingImage;
+			}
 		}
 	}
 
@@ -926,7 +933,7 @@
 
 			const void *imagefilez = sqlite3_column_text16(st, 4);
 			TPtrC16 imagefile((const TUint16*)imagefilez);
-			feedInfo->SetImageFileNameL(imagefile);
+			feedInfo->SetImageFileNameL(imagefile, &iPodcastModel);
 						
 			const void *linkz = sqlite3_column_text16(st, 5);
 			TPtrC16 link((const TUint16*)linkz);