diff --git a/phpBB/adm/style/acp_attachments.html b/phpBB/adm/style/acp_attachments.html
index 5d35666fdd..fd071588e6 100644
--- a/phpBB/adm/style/acp_attachments.html
+++ b/phpBB/adm/style/acp_attachments.html
@@ -331,15 +331,15 @@
 	<fieldset class="tabulated">
 	<legend>{L_TITLE}</legend>
 
-	<table class="table1 zebra-table">
+	<table class="table1 zebra-table fixed-width-table">
 	<thead>
 	<tr>
-		<th>{L_FILENAME}</th>
-		<th>{L_FILEDATE}</th>
-		<th>{L_FILESIZE}</th>
-		<th>{L_ATTACH_POST_ID}</th>
-		<th>{L_ATTACH_TO_POST}</th>
-		<th>{L_DELETE}</th>
+		<th style="width: 25%;">{L_FILENAME}</th>
+		<th style="width: 15%;">{L_FILEDATE}</th>
+		<th style="width: 15%;">{L_FILESIZE}</th>
+		<th style="width: 150px;">{L_ATTACH_POST_ID}</th>
+		<th style="width: 15%;">{L_ATTACH_TO_POST}</th>
+		<th style="width: 15%;">{L_DELETE}</th>
 	</tr>
 	</thead>
 	<tbody>
@@ -390,13 +390,13 @@
 	</div>
 
 <!-- IF .attachments -->
-	<table class="table1 zebra-table">
+	<table class="table1 zebra-table fixed-width-table">
 	<thead>
 	<tr>
 		<th>{L_FILENAME}</th>
-		<th>{L_POSTED}</th>
-		<th class="centered-text">{L_FILESIZE}</th>
-		<th class="centered-text">{L_MARK}</th>
+		<th style="width: 15%;">{L_POSTED}</th>
+		<th style="width: 15%;" class="centered-text">{L_FILESIZE}</th>
+		<th style="width: 10%;" class="centered-text">{L_MARK}</th>
 	</tr>
 	</thead>
 	<tbody>
diff --git a/phpBB/adm/style/acp_users.html b/phpBB/adm/style/acp_users.html
index b84e32013f..d1be177cfa 100644
--- a/phpBB/adm/style/acp_users.html
+++ b/phpBB/adm/style/acp_users.html
@@ -164,14 +164,14 @@
 	</div>
 
 	<!-- IF .attach -->
-	<table class="table1 zebra-table">
+	<table class="table1 zebra-table fixed-width-table">
 	<thead>
 	<tr>
 		<th>{L_FILENAME}</th>
-		<th>{L_POST_TIME}</th>
-		<th>{L_FILESIZE}</th>
-		<th>{L_DOWNLOADS}</th>
-		<th>{L_MARK}</th>
+		<th style="width: 15%;">{L_POST_TIME}</th>
+		<th style="width: 15%;">{L_FILESIZE}</th>
+		<th style="width: 15%;">{L_DOWNLOADS}</th>
+		<th style="width: 10%;">{L_MARK}</th>
 	</tr>
 	</thead>
 	<tbody>
diff --git a/phpBB/includes/acp/acp_attachments.php b/phpBB/includes/acp/acp_attachments.php
index 8eef2da24b..51c80d0385 100644
--- a/phpBB/includes/acp/acp_attachments.php
+++ b/phpBB/includes/acp/acp_attachments.php
@@ -1058,7 +1058,7 @@ class acp_attachments
 					$template->assign_block_vars('orphan', array(
 						'FILESIZE'			=> get_formatted_filesize($row['filesize']),
 						'FILETIME'			=> $user->format_date($row['filetime']),
-						'REAL_FILENAME'		=> utf8_wordwrap(utf8_basename((string) $row['real_filename']), 40, '<br />', true),
+						'REAL_FILENAME'		=> utf8_basename((string) $row['real_filename']),
 						'PHYSICAL_FILENAME'	=> utf8_basename($row['physical_filename']),
 						'ATTACH_ID'			=> $row['attach_id'],
 						'POST_IDS'			=> (!empty($post_ids[$row['attach_id']])) ? $post_ids[$row['attach_id']] : '',
@@ -1223,7 +1223,7 @@ class acp_attachments
 						'ATTACHMENT_POSTER'	=> get_username_string('full', (int) $row['poster_id'], (string) $row['username'], (string) $row['user_colour'], (string) $row['username']),
 						'FILESIZE'			=> get_formatted_filesize((int) $row['filesize']),
 						'FILETIME'			=> $user->format_date((int) $row['filetime']),
-						'REAL_FILENAME'		=> (!$row['in_message']) ? utf8_wordwrap(utf8_basename((string) $row['real_filename']), 40, '<br />', true) : '',
+						'REAL_FILENAME'		=> (!$row['in_message']) ? utf8_basename((string) $row['real_filename']) : '',
 						'PHYSICAL_FILENAME'	=> utf8_basename((string) $row['physical_filename']),
 						'EXT_GROUP_NAME'	=> (!empty($extensions[$row['extension']]['group_name'])) ? $user->lang['EXT_GROUP_' . $extensions[$row['extension']]['group_name']] : '',
 						'COMMENT'			=> $comment,
diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php
index 289672cdc3..85ed4c0bfb 100644
--- a/phpBB/includes/acp/acp_users.php
+++ b/phpBB/includes/acp/acp_users.php
@@ -2082,7 +2082,7 @@ class acp_users
 					}
 
 					$template->assign_block_vars('attach', array(
-						'REAL_FILENAME'		=> utf8_wordwrap(utf8_basename((string) $row['real_filename']), 40, '<br />', true),
+						'REAL_FILENAME'		=> utf8_basename((string) $row['real_filename']),
 						'COMMENT'			=> nl2br($row['attach_comment']),
 						'EXTENSION'			=> $row['extension'],
 						'SIZE'				=> get_formatted_filesize($row['filesize']),