[imp] Problems in IMP 2.2.5

[Marco Antonio Vieira Assad]

---------------------- multipart/mixed attachment
Cópia Chuck Hagenbuch <chuck@horde.org>:
> Woops, looks like that slipped by. These patches
> will fix it:
> 
> http://cvs.horde.org/diff.php/imp/Attic/message.php3?
> r1=2.23.2.67&r2=2.23.2.68&f=u
> 
> 
http://cvs.horde.org/diff.php/imp/lib/Attic/mimetypes.li
b?
> r1=1.8.2.30&r2=1.8.2.31&f=u
> 

Well, the second patch worked, the first not. it said:

[root@lx3 imp]# patch -p0 < patch1.txt
patching file `message.php3'
Hunk #1 FAILED at 3.
Hunk #3 FAILED at 136.
2 out of 3 hunks FAILED -- saving rejects to 
message.php3.rej

Any clue? I'm attaching the patch as I downloaded it.
---------------------- multipart/mixed attachment
===================================================================
RCS file: /cvs/horde/imp/Attic/message.php3,v
retrieving revision 2.23.2.67
retrieving revision 2.23.2.68
diff -p -u -r2.23.2.67 -r2.23.2.68
--- message.php3	2001/05/20 06:15:23	2.23.2.67
+++ message.php3	2001/05/23 18:46:59	2.23.2.68
@@ -3,9 +3,9 @@
 /*

   File: message.php3
-  $Author: max $
-  $Revision: 2.23.2.67 $
-  $Date: 2001/05/20 06:15:23 $
+  $Author: chuck $
+  $Revision: 2.23.2.68 $
+  $Date: 2001/05/23 18:46:59 $

   IMP: Copyright 1998, 1999, 2000 Charles J. Hagenbuch <chuck@horde.org>

@@ -117,6 +117,7 @@ function buildMessage ($attachments, $ms
 					$tmsg = str_replace('&lt;A href=&quot;', '<a href="', $tmsg);
 					$tmsg = str_replace('&quot; target=&quot;_blank&quot;&gt;', '" target="_blank">', $tmsg);
 					$tmsg = str_replace('&quot;&gt;','">', $tmsg);
+                    $tmsg = str_replace('&quot; onclick=&quot;', '" onclick="', $tmsg);
 					$tmsg = str_replace('\');&quot;&gt;', '\');">', $tmsg);
 					$tmsg = str_replace('&lt;/A&gt;', '</a>', $tmsg); // only reconvert capital /A tags - the ones we generated
 				}
@@ -135,7 +136,7 @@ function buildMessage ($attachments, $ms
 					$tmsg = convert_cyr_string($tmsg, 'm', 'k');
 				}

-				$tmsg = '<pre>' . wrap_message($tmsg) . '</pre>';
+				$tmsg = '<pre>' . $tmsg . '</pre>';

 				if ($textparts > 0) {
 					$msg = $msg . '</td></tr><tr><td></td></tr><tr><td bgcolor="' . $default->text_bg . '">' . $tmsg;


---------------------- multipart/mixed attachment--