Index: mail.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/mail.inc,v
retrieving revision 1.7
diff -u -r1.7 mail.inc
--- mail.inc	4 Sep 2007 21:10:45 -0000	1.7
+++ mail.inc	6 Feb 2008 05:26:44 -0000
@@ -246,7 +246,7 @@
  *
  * This function provides suitable alternatives for the following tags:
  * <a> <em> <i> <strong> <b> <br> <p> <blockquote> <ul> <ol> <li> <dl> <dt>
- * <dd> <h1> <h2> <h3> <h4> <h5> <h6> <hr>
+ * <dd> <h1> <h2> <h3> <h4> <h5> <h6> <hr> <cite> <code>
  *
  * @param $string
  *   The string to be transformed.
@@ -260,7 +260,7 @@
   // Cache list of supported tags.
   static $supported_tags;
   if (empty($supported_tags)) {
-    $supported_tags = array('a', 'em', 'i', 'strong', 'b', 'br', 'p', 'blockquote', 'ul', 'ol', 'li', 'dl', 'dt', 'dd', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'hr');
+    $supported_tags = array('a', 'em', 'i', 'strong', 'b', 'br', 'p', 'blockquote', 'ul', 'ol', 'li', 'dl', 'dt', 'dd', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'hr', 'cite', 'code');
   }
 
   // Make sure only supported tags are kept.
@@ -272,6 +272,9 @@
   // Apply inline styles.
   $string = preg_replace('!</?(em|i)>!i', '/', $string);
   $string = preg_replace('!</?(strong|b)>!i', '*', $string);
+  $string = preg_replace('!<cite>!i', '[', $string);
+  $string = preg_replace('!</cite>!i', ']', $string);
+  $string = preg_replace('!</?code>!i', '|', $string);
 
   // Replace inline <a> tags with the text of link and a footnote.
   // 'See <a href="http://drupal.org">the Drupal site</a>' becomes