diff --git a/mailboxes/config.info b/mailboxes/config.info
index 7c4aa44a9..848b02a7f 100644
--- a/mailboxes/config.info
+++ b/mailboxes/config.info
@@ -63,7 +63,7 @@ mail_dir=User mail file directory,3,None
 mail_style=Mail file directory style,4,0-mail/username,1-mail/u/username,2-mail/u/us/username,3-mail/u/s/username
 mail_file=Mail file in user home directories,3,None
 mail_sub=Mail directory in user home directories,3,None
-mail_usermin=Usermin-style folders subdirectory in home directory,3,None
+mail_usermin=Folders subdirectory under home directory,3,None
 mailbox_user=Usermin Read Mail configuration directory in home directory,3,None
 
 line2=User synchronization,11
diff --git a/mailboxes/folders-lib.pl b/mailboxes/folders-lib.pl
index 4f13ddded..ecc42029b 100644
--- a/mailboxes/folders-lib.pl
+++ b/mailboxes/folders-lib.pl
@@ -3359,7 +3359,9 @@ return false;
 }
 </script>
 EOF
+	}
 
+if ($any_attach) {
 	# Show form for attachments (both uploaded and server-side)
 	print &ui_table_start($server_attach ? $text{'reply_attach2'}
 					     : $text{'reply_attach3'},