Index: modules/contact.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/Attic/contact.module,v
retrieving revision 1.6.2.2
diff -u -p -r1.6.2.2 contact.module
--- modules/contact.module	17 Aug 2005 00:56:13 -0000	1.6.2.2
+++ modules/contact.module	14 Aug 2006 18:31:49 -0000
@@ -77,6 +77,10 @@ function contact_mail_user() {
         if (!$edit['subject']) {
           form_set_error('subject', t('You must enter a subject.'));
         }
+        elseif (preg_match("/\r|\n/", $edit['subject'])) {
+          form_set_error('subject', t('The subject cannot contain linebreaks.'));
+        }
+        
 
         if (!form_get_errors()) {
           // Compose the body: