diff --git a/ide/sourceeditprocs.pas b/ide/sourceeditprocs.pas
index fe30be31b0..16e5cc0c8a 100644
--- a/ide/sourceeditprocs.pas
+++ b/ide/sourceeditprocs.pas
@@ -62,6 +62,7 @@ var
   BGRed: Integer;
   BGGreen: Integer;
   BGBlue: Integer;
+  TokenStart: Integer;
 
   function InvertColor(AColor: TColor): TColor;
   var Red, Green, Blue: integer;
@@ -95,6 +96,20 @@ var
     ACanvas.Font.Color:=NewColor;
   end;
   
+  procedure WriteToken(var TokenStart, TokenEnd: integer);
+  var
+    CurToken: String;
+  begin
+    if TokenStart>=1 then begin
+      CurToken:=copy(AKey,TokenStart,TokenEnd-TokenStart);
+      ACanvas.TextOut(x+1, y, CurToken);
+      x := x + ACanvas.TextWidth(CurToken);
+      //debugln('Paint A Text="',CurToken,'" x=',dbgs(x),' y=',dbgs(y),' "',ACanvas.Font.Name,'" ',dbgs(ACanvas.Font.Height));
+      TokenStart:=0;
+    end;
+  end;
+  
+  
 var
   i: Integer;
   s: string;
@@ -222,10 +237,12 @@ begin
   end else begin
     // parse AKey for text and style
     i := 1;
+    TokenStart:=0;
     while i <= Length(AKey) do begin
       case AKey[i] of
       #1, #2:
         begin
+          WriteToken(TokenStart,i);
           // set color
           ACanvas.Font.Color := (Ord(AKey[i + 3]) shl 8
                         + Ord(AKey[i + 2])) shl 8
@@ -234,6 +251,7 @@ begin
         end;
       #3:
         begin
+          WriteToken(TokenStart,i);
           // set style
           case AKey[i + 1] of
           'B': ACanvas.Font.Style := ACanvas.Font.Style + [fsBold];
@@ -246,11 +264,11 @@ begin
           inc(i, 2);
         end;
       else
-        ACanvas.TextOut(x+1, y, AKey[i]);
-        x := x + ACanvas.TextWidth(AKey[i]);
+        if TokenStart<1 then TokenStart:=i;
         inc(i);
       end;
     end;
+    WriteToken(TokenStart,i);
   end;
 end;
 
diff --git a/lcl/include/canvas.inc b/lcl/include/canvas.inc
index eb6745b570..f64c428ee4 100644
--- a/lcl/include/canvas.inc
+++ b/lcl/include/canvas.inc
@@ -811,8 +811,7 @@ begin
   Flags := 0;
   If TextStyle.Opaque then
     Flags := ETO_Opaque;
-  ExtTextOut(FHandle, X, Y, Flags, nil,
-             PChar(Text), Length(Text), nil);
+  ExtUTF8Out(FHandle, X, Y, Flags, nil, PChar(Text), Length(Text), nil);
   MoveTo(X + TextWidth(Text), Y);
   Changed;
 end;
@@ -1269,6 +1268,9 @@ end;
 { =============================================================================
 
   $Log$
+  Revision 1.85  2005/01/01 20:05:08  mattias
+  accelerated code completion box in IDE and replaced ExtTextOut with ExtUTF8Out in TCanvas.TextOut
+
   Revision 1.84  2004/11/07 17:21:08  micha
   fix text position to be at X, Y; if alignment/layout indicates so