diff --git a/phpBB/adm/admin_attachments.php b/phpBB/adm/admin_attachments.php
index 9719cd9b76..01e5ef59e5 100644
--- a/phpBB/adm/admin_attachments.php
+++ b/phpBB/adm/admin_attachments.php
@@ -1,23 +1,15 @@
 <?php
-/***************************************************************************
- *                           admin_attachments.php
- *                            -------------------
- *   begin                : Sunday, Apr 20, 2003
- *   copyright            : (C) 2003 The phpBB Group
- *   email                : support@phpbb.com
- *
- *   $Id$
- *
- ***************************************************************************/
-
-/***************************************************************************
- *
- *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- ***************************************************************************/
+// -------------------------------------------------------------
+//
+// $Id$
+//
+// FILENAME  : admin_attachments.php
+// STARTED   : Sun Apr 20, 2003
+// COPYRIGHT : © 2001, 2003 phpBB Group
+// WWW       : http://www.phpbb.com/
+// LICENCE   : GPL vs2.0 [ see /docs/COPYING ] 
+// 
+// -------------------------------------------------------------
 
 if (!empty($setmodules))
 {
@@ -138,8 +130,6 @@ switch ($mode)
 		$l_title = 'EXTENSION_GROUPS_TITLE';
 }
 
-// Temporary Language Variables
-
 adm_page_header($user->lang[$l_title]);
 
 // Search Imagick
diff --git a/phpBB/download.php b/phpBB/download.php
index 4643a2869b..1bfa140db5 100644
--- a/phpBB/download.php
+++ b/phpBB/download.php
@@ -1,24 +1,15 @@
 <?php
-/***************************************************************************
- *                           download.php
- *                            -------------------
- *   begin                : Thu, Apr 10, 2003
- *   copyright            : (C) 2003 The phpBB Group
- *   email                : support@phpbb.com
- *
- *   $Id$
- *
- ***************************************************************************/
-
-/***************************************************************************
- *
- *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- ***************************************************************************/
-
+// -------------------------------------------------------------
+//
+// $Id$
+//
+// FILENAME  : download.php
+// STARTED   : Thu Apr 10, 2003
+// COPYRIGHT : © 2001, 2003 phpBB Group
+// WWW       : http://www.phpbb.com/
+// LICENCE   : GPL vs2.0 [ see /docs/COPYING ] 
+// 
+// -------------------------------------------------------------
 
 if ( defined('IN_PHPBB') )
 {
diff --git a/phpBB/includes/functions_display.php b/phpBB/includes/functions_display.php
index 7ed65d5968..cc3010f03d 100644
--- a/phpBB/includes/functions_display.php
+++ b/phpBB/includes/functions_display.php
@@ -1,23 +1,15 @@
 <?php
-/***************************************************************************
- *                           functions_display.php
- *                             ------------------
- *   begin                : Saturday, Feb 13, 2001
- *   copyright            : (C) 2001 The phpBB Group
- *   email                : support@phpbb.com
- *
- *   $Id$
- *
- ***************************************************************************/
-
-/***************************************************************************
- *
- *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- ***************************************************************************/
+// -------------------------------------------------------------
+//
+// $Id$
+//
+// FILENAME  : functions_display.php
+// STARTED   : Thu Nov 07, 2002
+// COPYRIGHT : © 2001, 2003 phpBB Group
+// WWW       : http://www.phpbb.com/
+// LICENCE   : GPL vs2.0 [ see /docs/COPYING ] 
+// 
+// -------------------------------------------------------------
 
 function display_forums($root_data = '', $display_moderators = TRUE)
 {
@@ -332,6 +324,7 @@ function display_attachments($attachment_data, &$update_count, $force_physical =
 
 		$display_name = $attachment['real_filename']; 
 		$comment = stripslashes(trim(str_replace("\n", '<br />', $attachment['comment'])));
+		$comment = htmlspecialchars(str_replace("\\'", "'", $comment));
 
 		$denied = FALSE;
 			
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php
index f06da1e412..22ef3c66ff 100644
--- a/phpBB/includes/functions_posting.php
+++ b/phpBB/includes/functions_posting.php
@@ -1,23 +1,15 @@
 <?php
-/***************************************************************************
- *                           functions_posting.php
- *                            -------------------
- *   begin                : Saturday, Feb 13, 2001
- *   copyright            : (C) 2001 The phpBB Group
- *   email                : support@phpbb.com
- *
- *   $Id$
- *
- ***************************************************************************/
-
-/***************************************************************************
- *
- *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- ***************************************************************************/
+// -------------------------------------------------------------
+//
+// $Id$
+//
+// FILENAME  : functions_posting.php
+// STARTED   : Sun Jul 14, 2002
+// COPYRIGHT : © 2001, 2003 phpBB Group
+// WWW       : http://www.phpbb.com/
+// LICENCE   : GPL vs2.0 [ see /docs/COPYING ] 
+// 
+// -------------------------------------------------------------
 
 // Fill smiley templates (or just the variables) with smileys, either in a window or inline
 function generate_smilies($mode)
diff --git a/phpBB/includes/message_parser.php b/phpBB/includes/message_parser.php
index 450656d8e7..fb7cb66320 100644
--- a/phpBB/includes/message_parser.php
+++ b/phpBB/includes/message_parser.php
@@ -4,7 +4,7 @@
 // $Id$
 //
 // FILENAME  : message_parser.php
-// STARTED   : Sat Feb 13, 2001
+// STARTED   : Fri Feb 28, 2003
 // COPYRIGHT : © 2003 phpBB Group
 // WWW       : http://www.phpbb.com/
 // LICENCE   : GPL vs2.0 [ see /docs/COPYING ] 
diff --git a/phpBB/posting.php b/phpBB/posting.php
index 0fdf3bf7b6..b9459802d0 100644
--- a/phpBB/posting.php
+++ b/phpBB/posting.php
@@ -1,23 +1,15 @@
 <?php
-/***************************************************************************
- *                                posting.php
- *                            -------------------
- *   begin                : Saturday, Feb 13, 2001
- *   copyright            : (C) 2001 The phpBB Group
- *   email                : support@phpbb.com
- *
- *   $Id$
- *
- ***************************************************************************/
-
-/***************************************************************************
- *
- *   This program is free software; you can redistribute it and/or modify
- *   it under the terms of the GNU General Public License as published by
- *   the Free Software Foundation; either version 2 of the License, or
- *   (at your option) any later version.
- *
- ***************************************************************************/
+// -------------------------------------------------------------
+//
+// $Id$
+//
+// FILENAME  : posting.php
+// STARTED   : Sat Feb 17, 2001
+// COPYRIGHT : © 2001, 2003 phpBB Group
+// WWW       : http://www.phpbb.com/
+// LICENCE   : GPL vs2.0 [ see /docs/COPYING ] 
+// 
+// -------------------------------------------------------------
 
 define('IN_PHPBB', true);
 $phpbb_root_path = './';
@@ -228,7 +220,13 @@ if ($sql != '')
 
 	// Get Attachment Data
 	$message_parser->attachment_data = (isset($_POST['attachment_data'])) ? $_POST['attachment_data'] : array();
-	
+
+	// Make sure we do not add slashes twice...
+	foreach ($message_parser->attachment_data as $pos => $var)
+	{
+		$message_parser->attachment_data[$pos]['comment'] = stripslashes($message_parser->attachment_data[$pos]['comment']);
+	}
+
 	if ($post_attachment && !$submit && !$refresh && !$preview && $mode == 'edit')
 	{
 		$sql = 'SELECT d.*