diff --git a/offline.js b/offline.js
index d9b32cf28..e146b55e1 100644
--- a/offline.js
+++ b/offline.js
@@ -166,6 +166,30 @@ function viewfeed_offline(feed_id, subop, is_cat, subop_param, skip_history, off
 	
 				tmp += "  ";
 	
+				tmp += "<span onmouseover=\"enable_selection(false)\" "+
+					"onmouseout=\"enable_selection(true) \"" +
+					"onclick=\"toggleHeadlineActions()\" id=\"headlineActionsDrop\">" +
+					__("Actions...") + "&nbsp;&nbsp;<img src=\"images/down_arrow.png\">" +
+				"</span>";
+
+				tmp += "<ul id=\"headlineActionsBody\" style=\"display : none\">";
+
+				var tog_unread_link = "";
+				var tog_marked_link = "";
+				var catchup_sel_link = "";
+				var catchup_feed_link = "";
+
+				tmp += "<li class=\"insensitive\">"+__('Selection toggle:')+"</li>"+
+				"<li onclick=\""+tog_unread_link+"\">&nbsp;&nbsp;"+__('Unread')+"</li>"+
+				"<li onclick=\""+tog_marked_link+"\">&nbsp;&nbsp;"+__('Starred')+"</li>"+
+				"<li class=\"insensitive\">"+__('Mark as read:')+"</li>"+
+				"<li onclick=\""+catchup_sel_link+"\">&nbsp;&nbsp;"+__('Selection')+"</li>";
+
+				tmp += "<li onclick=\""+catchup_feed_link+"\">&nbsp;&nbsp;"+__('Entire feed')+
+					"</li>";
+
+				tmp += "</ul>";
+
 				tmp += "</div>";
 	
 				tmp += "<div id=\"headlinesInnerContainer\" onscroll=\"headlines_scroll_handler()\">";
diff --git a/tt-rss.js b/tt-rss.js
index f6eea6661..e5bcbf595 100644
--- a/tt-rss.js
+++ b/tt-rss.js
@@ -142,6 +142,10 @@ function backend_sanity_check_callback(transport) {
 			}
 		}
 
+		if (getURLParam("offline")) {
+			return init_offline();
+		}
+
 		var reply = transport.responseXML.firstChild.firstChild;
 
 		if (!reply) {