diff --git a/feedlist.js b/feedlist.js
index 05867d7b3..29de567bc 100644
--- a/feedlist.js
+++ b/feedlist.js
@@ -151,6 +151,9 @@ function viewfeed_offline(feed_id, subop, is_cat, subop_param, skip_history, off
 			} 
 		}
 
+		disableContainerChildren("headlinesToolbar", false);
+		Form.enable("main_toolbar_form");
+
 		var f = document.getElementById("headlines-frame");
 		try {
 			if (reply.offset == 0) { 
@@ -241,8 +244,8 @@ function viewfeed_offline(feed_id, subop, is_cat, subop_param, skip_history, off
 				tmp += "<td onclick='view("+id+","+feed_id+")' "+
 					"class='hlContent' valign='middle'>";
 	
-				tmp += "<a id=\"RTITLE-$id\" href=\"" + 
-					param_escape(rs.fieldByName("link")) + "\"" +
+				tmp += "<a target=\"_blank\" id=\"RTITLE-$id\" href=\"" + 
+					rs.fieldByName("link") + "\"" +
 					"onclick=\"return view("+id+","+feed_id+");\">"+
 					rs.fieldByName("title");
 
diff --git a/viewfeed.js b/viewfeed.js
index e83303500..de392103f 100644
--- a/viewfeed.js
+++ b/viewfeed.js
@@ -381,11 +381,28 @@ function article_callback2(transport, id, feed_id) {
 	}
 }
 
+function view_offline(id, feed_id) {
+	try {
+
+		enableHotkeys();
+		showArticleInHeadlines(id);
+
+		render_article("FIXME");
+
+		return false;
+
+	} catch (e) {
+		exception_error("view_offline", e);
+	}
+}
+
 function view(id, feed_id, skip_history) {
 	
 	try {
 		debug("loading article: " + id + "/" + feed_id);
-	
+
+		if (offline_mode) return view_offline(id, feed_id);
+
 		var cached_article = cache_find(id);
 
 		debug("cache check result: " + (cached_article != false));