--- python2.4/email/Charset.py~	2005-11-24 04:20:09.000000000 +0100
+++ python2.4/email/Charset.py	2005-11-24 04:21:02.000000000 +0100
@@ -244,6 +244,8 @@
         """Convert a string from the input_codec to the output_codec."""
         if self.input_codec <> self.output_codec:
             return unicode(s, self.input_codec).encode(self.output_codec)
+        elif isinstance(s, unicode):
+            return s.encode(self.output_codec)
         else:
             return s