diff --git a/backend.php b/backend.php
index 1ffa40863..567bbf7ba 100644
--- a/backend.php
+++ b/backend.php
@@ -1939,7 +1939,7 @@
 
 			print "<tr class=\"title\">
 						<td width=\"5%\">Select</td><td width=\"40%\">SQL expression
-						<a class=\"helpLink\" href=\"javascript:popupHelp(1)\">(?)</a>
+						<a class=\"helpLink\" href=\"javascript:displayHelpInfobox(1)\">(?)</a>
 						</td>
 						<td width=\"40%\">Caption</td></tr>";
 			
@@ -2044,53 +2044,34 @@
 	}
 
 	if ($op == "help") {
-		print "<html><head>
-			<title>Tiny Tiny RSS : Help</title>
-			<link rel=\"stylesheet\" href=\"tt-rss.css\" type=\"text/css\">
-			<script type=\"text/javascript\" src=\"functions.js\"></script>
-			<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">
-			</head><body>";
+		if (!$_GET["noheaders"]) {
+			print "<html><head>
+				<title>Tiny Tiny RSS : Help</title>
+				<link rel=\"stylesheet\" href=\"tt-rss.css\" type=\"text/css\">
+				<script type=\"text/javascript\" src=\"functions.js\"></script>
+				<meta http-equiv=\"Content-Type\" content=\"text/html; charset=utf-8\">
+				</head><body>";
+		}
 
 		$tid = sprintf("%d", $_GET["tid"]);
 
-		/* FIXME this badly needs real implementation */
+		print "<div class='infoBoxContents'>";
 
-		print "<div class='helpResponse'>";
-
-		?>
-
-		<h1>Help for SQL expressions</h1>
-
-		<h2>Description</h2>
-
-		<p>The &laquo;SQL expression&raquo; is added to WHERE clause of
-			view feed query. You can match on ttrss_entries table fields
-			and even use subselect to query additional information. This 
-			functionality is considered to be advanced and requires basic
-			understanding of SQL.</p>
-			
-		<h2>Examples</h2>
-
-		<pre>unread = true</pre>
-
-		Matches all unread articles
-
-		<pre>title like '%Linux%'</pre>
-
-		Matches all articles which mention Linux in the title. You get the idea.
-
-		<p>See the database schema included in the distribution package for gruesome
-		details.</p>
-
-		<?
-
-		print "<div align='center'>
-			<a class=\"helpLink\"
-			href=\"javascript:window.close()\">(Close this window)</a></div>";
+		if (file_exists("help/$tid.php")) {
+			include("help/$tid.php");
+		} else {
+			print "<p>Help topic not found.</p>";
+		}
 
 		print "</div>";
 
-		print "</body></html>";
+		print "<div align='center'>
+			<input type='submit' class='button'			
+			onclick=\"closeInfoBox()\" value=\"Close this window\"></div>";
+
+		if (!$_GET["noheaders"]) { 
+			print "</body></html>";
+		}
 
 	}
 
diff --git a/help/1.php b/help/1.php
new file mode 100644
index 000000000..b6174812a
--- /dev/null
+++ b/help/1.php
@@ -0,0 +1,23 @@
+<h1>Help for SQL expressions</h1>
+
+<h2>Description</h2>
+
+<p>The &laquo;SQL expression&raquo; is added to WHERE clause of
+	view feed query. You can match on ttrss_entries table fields
+	and even use subselect to query additional information. This 
+	functionality is considered to be advanced and requires basic
+	understanding of SQL.</p>
+	
+<h2>Examples</h2>
+
+<p>Match all unread articles:</p>
+
+<pre>unread = true</pre>
+
+<p>Matches all articles which mention Linux in the title:</p>
+
+<pre>title like '%Linux%'</pre>
+
+<p>See the database schema included in the distribution package for gruesome
+details.</p>
+
diff --git a/prefs.js b/prefs.js
index b69369ba1..5c699f237 100644
--- a/prefs.js
+++ b/prefs.js
@@ -695,6 +695,16 @@ function labelTest() {
 
 }
 
+function displayHelpInfobox(topic_id) {
+
+	xmlhttp.open("GET", "backend.php?op=help&tid=" +
+		param_escape(topic_id) + "&noheaders=1", true);
+
+	xmlhttp.onreadystatechange=infobox_callback;
+	xmlhttp.send(null);
+
+}
+
 function labelEditCancel() {
 
 	if (!xmlhttp_ready(xmlhttp)) {
diff --git a/tt-rss.css b/tt-rss.css
index f6f3ae6c5..d7c905734 100644
--- a/tt-rss.css
+++ b/tt-rss.css
@@ -534,6 +534,7 @@ pre {
 	border : 1px solid #c0c0c0;
 	padding : 5px;
 	background : #f0f0f0;
+	margin : 5px 10px 5px 10px;
 }
 
 input.extSearch {
