diff --git a/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_en.properties b/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_en.properties
index 0cf4985f..30252b63 100644
--- a/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_en.properties
+++ b/libresonic-main/src/main/resources/org/libresonic/player/i18n/ResourceBundle_en.properties
@@ -858,6 +858,9 @@ helppopup.smtpEncryption.text = <p>The encryption method to be used to connect t
 helppopup.smtpFrom.title = From address
 helppopup.smtpFrom.text = <p>The sender address for mails originating from the Libresonic server. Must be a valid e-mail address.</p>
 
+helppopup.scanMediaFolders.title = Media folders scanning rules
+helppopup.scanMediaFolders.text = <p>Note that any subfolder whose name starts with a dot (.) or @eaDir is ignored. Also all Thumbs.db files are.</p>
+
 # wap/index.jsp
 wap.index.missing = No music found
 wap.index.playlist = Playlist
diff --git a/libresonic-main/src/main/webapp/WEB-INF/jsp/musicFolderSettings.jsp b/libresonic-main/src/main/webapp/WEB-INF/jsp/musicFolderSettings.jsp
index 48c77a7f..a26f0cec 100644
--- a/libresonic-main/src/main/webapp/WEB-INF/jsp/musicFolderSettings.jsp
+++ b/libresonic-main/src/main/webapp/WEB-INF/jsp/musicFolderSettings.jsp
@@ -19,6 +19,9 @@
     </script>
 </head>
 <body class="mainframe bgcolor1" onload="init()">
+<script type="text/javascript" src="<c:url value="/script/wz_tooltip.js"/>"></script>
+<script type="text/javascript" src="<c:url value="/script/tip_balloon.js"/>"></script>
+
 
 <c:import url="settingsHeader.jsp">
     <c:param name="cat" value="musicFolder"/>
@@ -89,7 +92,12 @@
         </span>
     </div>
 
-    <p class="forward"><a href="musicFolderSettings.view?scanNow"><fmt:message key="musicfoldersettings.scannow"/></a></p>
+    <table>
+        <tr>
+            <td><div class="forward"><a href="musicFolderSettings.view?scanNow"><fmt:message key="musicfoldersettings.scannow"/></a></div></td>
+            <td><c:import url="helpToolTip.jsp"><c:param name="topic" value="scanMediaFolders"/></c:import></td>
+        </tr>
+    </table>
 
     <c:if test="${command.scanning}">
         <p style="width:60%"><b><fmt:message key="musicfoldersettings.nowscanning"/></b></p>
