diff --git a/gramps2/ChangeLog b/gramps2/ChangeLog
index f70edee21..b30be47f3 100644
--- a/gramps2/ChangeLog
+++ b/gramps2/ChangeLog
@@ -1,3 +1,7 @@
+2005-09-12  Don Allingham  <don@gramps-project.org>
+	* src/plugins/ScratchPad.py: handle unicode better
+	* src/DdTargets.py: handle unicode better
+
 2005-09-11  Don Allingham  <don@gramps-project.org>
 	* src/NameDisplay: include nickname if available
 	* src/plugins/ScratchPad.py: Handle null handle
diff --git a/gramps2/src/DdTargets.py b/gramps2/src/DdTargets.py
index 61c049e28..57889c524 100644
--- a/gramps2/src/DdTargets.py
+++ b/gramps2/src/DdTargets.py
@@ -135,11 +135,11 @@ class _DdTargets(object):
 
         # List of all the test types. These are types
         # that can be interpreted as text.
-        self._all_text_types = (self.TEXT,
+        self._all_text_types = (self.UTF8_STRING,
+                                self.TEXT,
                                 self.TEXT_MIME,
                                 self.STRING,
-                                self.COMPOUND_TEXT,
-                                self.UTF8_STRING)
+                                self.COMPOUND_TEXT)
 
     def insert(self,dd_type):
         """Add a target to the lookup lists. These lists are
diff --git a/gramps2/src/plugins/ScratchPad.py b/gramps2/src/plugins/ScratchPad.py
index ad6da7575..dd064ade1 100644
--- a/gramps2/src/plugins/ScratchPad.py
+++ b/gramps2/src/plugins/ScratchPad.py
@@ -405,6 +405,7 @@ class ScratchPadText(ScratchPadWrapper):
         self._type  = _("Text")
 
         self._title = ""
+        self._obj = unicode(self._obj)
         self._value = self._obj
 
     def tooltip(self):
@@ -629,7 +630,6 @@ class ScratchPadListView:
     def object_title(self, column, cell, model, iter, user_data=None):
         o = model.get_value(iter, 1)
         cell.set_property('text', o.get_title())
-
     
     def object_value(self, column, cell, model, iter, user_data=None):
         o = model.get_value(iter, 1)