diff --git a/ChangeLog b/ChangeLog
index 02c78053b..f00268cc1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-04-01  Richard Taylor <rjt-gramps@thegrindstone.me.uk>
+	* src/DdTargets.py: added dnd type for media objects
+	* src/ImageSelect.py: altered dnd code to use gramps specific dnd target
+	when dnd is used between gramps windows.
+	* src/plugins/ScratchPad.py: added support for media object. This is still
+	a little simplistic. It would be nice to generate thumbnails as tooltips and
+	to access some of the image meta data in the ui.
+	
 2005-04-01  Richard Taylor <rjt-gramps@thegrindstone.me.uk>
 	* src/ImageSelect.py (Gallery.on_drag_begin): tiny fix to correct image dnd
 
diff --git a/src/DdTargets.py b/src/DdTargets.py
index c7fcb9588..1522f0a34 100644
--- a/src/DdTargets.py
+++ b/src/DdTargets.py
@@ -103,6 +103,7 @@ class _DdTargets(object):
         self.ADDRESS   = _DdType(self,'paddr')
         self.SOURCEREF = _DdType(self,'srcref')
         self.NAME      = _DdType(self,'name')
+        self.MEDIAOBJ  = _DdType(self,'mediaobj')
 
         self.FAMILY_EVENT     = _DdType(self,'fevent')
         self.FAMILY_ATTRIBUTE = _DdType(self,'fattr')
@@ -156,7 +157,8 @@ class _DdTargets(object):
         """return a list of all the type names that are internal
         to gramps."""
         
-        return (self.URL.drag_type,
+        return (self.MEDIAOBJ.drag_type,
+                self.URL.drag_type,
                 self.EVENT.drag_type,
                 self.ATTRIBUTE.drag_type,
                 self.ADDRESS.drag_type,
@@ -179,7 +181,8 @@ class _DdTargets(object):
     def all_gramps_targets(self):
         """return a list off the internal gramps targets."""
         
-        return (self.URL.target(),
+        return (self.MEDIAOBJ.target(),
+                self.URL.target(),
                 self.EVENT.target(),
                 self.ATTRIBUTE.target(),
                 self.ADDRESS.target(),
diff --git a/src/ImageSelect.py b/src/ImageSelect.py
index 63f4a14d3..e1fa5faca 100644
--- a/src/ImageSelect.py
+++ b/src/ImageSelect.py
@@ -66,6 +66,7 @@ import DateHandler
 import Date
 import ImgManip
 from QuestionDialog import ErrorDialog
+from DdTargets import DdTargets
 
 _IMAGEX = 140
 _IMAGEY = 150
@@ -228,7 +229,8 @@ class Gallery(ImageSelect):
 
         self.commit = commit
         if path:
-            icon_list.drag_dest_set(gtk.DEST_DEFAULT_ALL, _drag_targets,
+            icon_list.drag_dest_set(gtk.DEST_DEFAULT_ALL,
+                                    [DdTargets.MEDIAOBJ.target()]+_drag_targets,
                                     gtk.gdk.ACTION_COPY | gtk.gdk.ACTION_MOVE)
             icon_list.connect('event',self.item_event)
             icon_list.connect("drag_data_received",
@@ -292,7 +294,7 @@ class Gallery(ImageSelect):
                 icon_index = self.get_index(widget,event.x,event.y)-1
                 self.sel_obj = self.dataobj.get_media_list()[icon_index]
                 if self.drag_item:
-                    widget.drag_begin(_drag_targets,
+                    widget.drag_begin([DdTargets.MEDIAOBJ.target()]+_drag_targets,
                                       gtk.gdk.ACTION_COPY|gtk.gdk.ACTION_MOVE,
                                       self.button, event)
                     
@@ -547,6 +549,7 @@ class Gallery(ImageSelect):
             return
         data = self.p_map[self.drag_item]
         selection_data.set(selection_data.target, 8, data[4])
+        print "dragging ", repr(data[4]), " with target ", repr(selection_data.target)
         self.drag_item = None
         
     def on_add_media_clicked(self, obj):
diff --git a/src/plugins/ScratchPad.py b/src/plugins/ScratchPad.py
index 850e075bf..6872de3bd 100644
--- a/src/plugins/ScratchPad.py
+++ b/src/plugins/ScratchPad.py
@@ -406,6 +406,25 @@ class ScratchPadText(ScratchPadWrapper):
                "%s" % (_("Text"),
                        escape(self._obj))
 
+class ScratchMediaObj(ScratchPadWrapper):
+
+    DROP_TARGETS = [DdTargets.MEDIAOBJ]
+    DRAG_TARGET  = DdTargets.MEDIAOBJ
+    ICON         = LINK_PIC
+
+    def __init__(self,db,obj):
+        ScratchPadWrapper.__init__(self,db,obj)
+        self._type  = _("Media Object")
+
+        self._title = ""
+        self._value = ""
+
+    def tooltip(self):
+        global escape
+        return "<big><b>%s</b></big>\n"\
+               "%s" % (_("Media Object"),
+                       escape(self._obj))
+
 
 #-------------------------------------------------------------------------
 #
@@ -498,6 +517,8 @@ class ScratchPadListView:
         self.register_wrapper_class(ScratchPadSourceRef)
         self.register_wrapper_class(ScratchPadName)
         self.register_wrapper_class(ScratchPadText)
+        self.register_wrapper_class(ScratchMediaObj)
+        
 
     def register_wrapper_class(self,wrapper_class):
         for drop_target in wrapper_class.DROP_TARGETS: