--- a/application/src/PodcastShowsView.cpp	Mon Nov 22 00:32:23 2010 +0000
+++ b/application/src/PodcastShowsView.cpp	Mon Nov 22 13:11:27 2010 +0000
@@ -648,14 +648,12 @@
 			break;
 		case EPodcastMarkAllPlayed:
 			{
-			if (iShowNewShows) {
-				TBuf<KMaxMessageLength> msg;
-				iEikonEnv->ReadResourceL(msg, R_MARK_ALL_OLD_QUERY);
-				if (!ShowQueryMessageL(msg))
-					{
-					break;
-					}
-			}
+			TBuf<KMaxMessageLength> msg;
+			iEikonEnv->ReadResourceL(msg, R_MARK_ALL_OLD_QUERY);
+			if (!ShowQueryMessageL(msg))
+				{
+				break;
+				}
 			iPodcastModel.MarkSelectionPlayedL();
 			UpdateListboxItemsL();
 			}
@@ -836,7 +834,7 @@
 		{
 		CShowInfo *info = iPodcastModel.ActiveShowList()[index];
 		info->SetPlayState(aPlayed ? EPlayed : ENeverPlayed);
-		if (aPlayed)
+		if (aPlayed && info->DownloadState() == EDownloaded)
 			{
 			// PostPlayHandling calls UpdateShow, which is slow, so we don't need to do it again
 			iPodcastModel.ShowEngine().PostPlayHandling(info);

--- a/engine/src/ShowEngine.cpp	Mon Nov 22 00:32:23 2010 +0000
+++ b/engine/src/ShowEngine.cpp	Mon Nov 22 13:11:27 2010 +0000
@@ -1718,6 +1718,7 @@
 		deleteDate.HomeTime();
 		deleteDate += daysAhead;
 		aShow->SetDeleteDate(deleteDate);
+		DP2("Setting show %S to be deleted on the %d th", &aShow->Title(), deleteDate.DayNoInMonth()+1);
 		}
 	
 	UpdateShowL(*aShow);