--- Stream.pm	Thu Aug 26 00:23:32 2004
+++ XML-Stream-no-Encode.pm	Mon Mar  7 14:11:59 2005
@@ -254,7 +254,8 @@
 use Authen::SASL;
 use MIME::Base64;
 use utf8;
-use Encode;
+use Unicode::UTF8simple;
+
 
 $SIG{PIPE} = "IGNORE";
 
@@ -1583,6 +1584,7 @@
     my $sid = shift;
     my $buff;
     my $status = 1;
+    my $utf8conv = new Unicode::UTF8simple;
 
     $self->debug(3,"Read: sid($sid)");
     $self->debug(3,"Read: connectionType($self->{SIDS}->{$sid}->{connectiontype})");
@@ -1614,7 +1616,7 @@
         unless (($buff eq "") || !defined($status) || ($status == 0));
     if (defined($status) && ($status != 0))
     {
-        $buff = Encode::decode_utf8($buff);
+        $buff = $utf8conv->fromUTF8('iso-8859-1', $buff);
         return $buff;
     }
     #return $buff unless (!defined($status) || ($status == 0));
@@ -1632,6 +1634,7 @@
 {
     my $self = shift;
     my $sid = shift;
+    my $utf8conv = new Unicode::UTF8simple;
     $self->debug(1,"Send: (@_)");
     $self->debug(3,"Send: sid($sid)");
     $self->debug(3,"Send: status($self->{SIDS}->{$sid}->{status})");
@@ -1658,7 +1661,7 @@
     {
         $self->debug(3,"Send: can_write");
         
-        $self->{SENDSTRING} = Encode::encode_utf8(join("",@_));
+        $self->{SENDSTRING} = $utf8conv->toUTF8('iso-8859-1', join("",@_));
 
         $self->{SENDWRITTEN} = 0;
         $self->{SENDOFFSET} = 0;