diff --git a/phpBB/adm/style/acp_attachments.html b/phpBB/adm/style/acp_attachments.html
index e026b81ad0..5d35666fdd 100644
--- a/phpBB/adm/style/acp_attachments.html
+++ b/phpBB/adm/style/acp_attachments.html
@@ -389,6 +389,7 @@
 	<!-- ENDIF -->
 	</div>
 
+<!-- IF .attachments -->
 	<table class="table1 zebra-table">
 	<thead>
 	<tr>
@@ -412,6 +413,11 @@
 	<!-- END attachments -->
 	</tbody>
 	</table>
+<!-- ELSE -->
+	<div class="errorbox">
+		<p>{L_NO_ATTACHMENTS}</p>
+	</div>
+<!-- ENDIF -->
 
 	<!-- IF TOTAL_FILES -->
 	<div class="pagination">
@@ -422,6 +428,7 @@
 			&bull; {PAGE_NUMBER}
 		<!-- ENDIF -->
 	</div>
+	<!-- ENDIF -->
 
 	<fieldset class="display-options">
 		{L_DISPLAY_LOG}{L_COLON} &nbsp;{S_LIMIT_DAYS}&nbsp;{L_SORT_BY}{L_COLON} {S_SORT_KEY} {S_SORT_DIR}
@@ -429,7 +436,6 @@
 	</fieldset>
 
 	<hr />
-	<!-- ENDIF -->
 
 <!-- IF .attachments -->
 	<fieldset class="quick">
diff --git a/phpBB/language/en/acp/attachments.php b/phpBB/language/en/acp/attachments.php
index c7d68d29c2..1eab22839b 100644
--- a/phpBB/language/en/acp/attachments.php
+++ b/phpBB/language/en/acp/attachments.php
@@ -130,6 +130,7 @@ $lang = array_merge($lang, array(
 	'NOT_ALLOWED_IN_PM'			=> 'Only allowed in posts',
 	'NOT_ALLOWED_IN_PM_POST'	=> 'Not allowed',
 	'NOT_ASSIGNED'				=> 'Not assigned',
+	'NO_ATTACHMENTS'			=> 'No attachments found for this period.',
 	'NO_EXT_GROUP'				=> 'None',
 	'NO_EXT_GROUP_NAME'			=> 'No group name entered',
 	'NO_EXT_GROUP_SPECIFIED'	=> 'No extension group specified.',