diff --git a/IPython/genutils.py b/IPython/genutils.py
index 8ac4ba3..ea6152a 100644
--- a/IPython/genutils.py
+++ b/IPython/genutils.py
@@ -5,7 +5,7 @@ General purpose utilities.
 This is a grab-bag of stuff I find useful in most programs I write. Some of
 these things are also convenient when working at the command line.
 
-$Id: genutils.py 2763 2007-09-14 06:35:44Z fperez $"""
+$Id: genutils.py 2767 2007-09-18 17:26:52Z vivainio $"""
 
 #*****************************************************************************
 #       Copyright (C) 2001-2006 Fernando Perez. <fperez@colorado.edu>
@@ -1104,7 +1104,7 @@ def make_quoted_expr(s):
     else:
         # give up, backslash-escaped string will do
         return '"%s"' % esc_quotes(s)
-    res = itpl("$raw$quote$s$tailpadding$quote$tail")
+    res = raw + quote + s + tailpadding + quote + tail
     return res
 
 
diff --git a/doc/ChangeLog b/doc/ChangeLog
index 184917f..bf66be4 100644
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,9 @@
+2007-09-18  Ville Vainio  <vivainio@gmail.com>
+
+	* genutils.py(make_quoted_expr): Do not use Itpl, it does
+        not support unicode at the moment. Fixes (many) magic calls with
+        special characters.
+
 2007-09-14  Fernando Perez  <Fernando.Perez@colorado.edu>
 
 	* IPython/genutils.py (doctest_reload): expose the doctest