diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php
index aab19455..901e3a12 100644
--- a/adminer/include/adminer.inc.php
+++ b/adminer/include/adminer.inc.php
@@ -172,7 +172,7 @@ class Adminer {
 	* @return string HTML code, "" to ignore field
 	*/
 	function fieldName($field, $order = 0) {
-		return '<span title="' . h($field["full_type"]) . '">' . h($field["field"]) . '</span>';
+		return '<span title="' . h($field["full_type"] . ($field["comment"] != "" ? " : $field[comment]" : '')) . '">' . h($field["field"]) . '</span>';
 	}
 
 	/** Print links after select heading
diff --git a/changes.txt b/changes.txt
index 9f4b804e..1d6b98de 100644
--- a/changes.txt
+++ b/changes.txt
@@ -1,5 +1,6 @@
 Adminer dev:
 Align numbers right (bug #912)
+Display comment in title of field
 Remember export setting at SQL command
 SQL textarea: Open help on Ctrl+click
 Security: Disallow writing temporary files to symlinks (bug #855)
diff --git a/plugins/struct-comments.php b/plugins/struct-comments.php
deleted file mode 100644
index 80c216df..00000000
--- a/plugins/struct-comments.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-/** Show comments of sql structure in more places (mainly where you edit things)
- * @link https://www.adminer.org/plugins/#use
- * @author Adam Kuśmierz, http://kusmierz.be/
- * @license https://www.apache.org/licenses/LICENSE-2.0 Apache License, Version 2.0
- * @license https://www.gnu.org/licenses/gpl-2.0.html GNU General Public License, version 2 (one or other)
- */
-class AdminerStructComments {
-
-	function fieldName(&$field, $order = 0) {
-		return '<span title="' . Adminer\h($field["full_type"]) . (!empty($field["comment"]) ? ': ' . $field["comment"] : '') . '">' . Adminer\h($field["field"]) . '</span>';
-	}
-}