diff --git a/src/de/danoeh/antennapod/feed/FeedManager.java b/src/de/danoeh/antennapod/feed/FeedManager.java
index d9b4e6c56..2d1948bb0 100644
--- a/src/de/danoeh/antennapod/feed/FeedManager.java
+++ b/src/de/danoeh/antennapod/feed/FeedManager.java
@@ -380,6 +380,17 @@ public class FeedManager {
 			Log.d(TAG, "Setting item with title " + item.getTitle()
 					+ " as read/unread");
 		item.read = read;
+
+		FeedMedia media = item.getMedia();
+		if (media != null) {
+			if (read) {
+				media.setPlaybackCompletionDate(new Date());
+			} else {
+				media.setPlaybackCompletionDate(null);
+				media.setPosition(0);
+			}
+		}
+
 		setFeedItem(context, item);
 		contentChanger.post(new Runnable() {
 
diff --git a/src/de/danoeh/antennapod/util/menuhandler/FeedItemMenuHandler.java b/src/de/danoeh/antennapod/util/menuhandler/FeedItemMenuHandler.java
index 91f199ce0..d6bc79ade 100644
--- a/src/de/danoeh/antennapod/util/menuhandler/FeedItemMenuHandler.java
+++ b/src/de/danoeh/antennapod/util/menuhandler/FeedItemMenuHandler.java
@@ -50,8 +50,8 @@ public class FeedItemMenuHandler {
 				selectedItem.getLink() != null);
 
 		menu.findItem(R.id.mark_unread_item).setVisible(
-				selectedItem.isRead() && AppConfig.DEBUG);
-		menu.findItem(R.id.mark_read_item).setVisible(!selectedItem.isRead());
+				selectedItem.isRead() || selectedItem.isInProgress());
+		menu.findItem(R.id.mark_read_item).setVisible(!selectedItem.isRead() || selectedItem.isInProgress());
 
 		if (selectedItem.getLink() != null) {
 			menu.findItem(R.id.visit_website_item).setVisible(true);