Index: image.module
===================================================================
--- image.module	(revision 57)
+++ image.module	(working copy)
@@ -283,8 +283,8 @@
   }
   $request = ($_GET['size']) ? $_GET['size'] : 'preview';
   $node = node_prepare($node, $main);
-  $node->teaser = l(image_display($node, 'thumbnail'), 'node/'.$node->nid, array(), NULL, NULL, FALSE, TRUE) . $node->teaser;
-  $node->body = image_display($node, $request) . $node->body;
+  $node->teaser = theme('image_teaser', $node);
+  $node->body = theme('image_body', $node);
 }
 
 
@@ -487,6 +487,20 @@
 }
 
 /**
+ * Theme a teaser
+ */
+function theme_image_teaser($node) {
+ return l(image_display($node, 'thumbnail'), 'node/'.$node->nid, array(), NULL, NULL, FALSE, TRUE) . $node->teaser;
+}
+
+/**
+ * Theme a body
+ */
+function theme_image_body($node) {
+ return image_display($node, $request) . $node->body;
+}
+
+/**
  * Theme a gallery page
  */
 function theme_image_gallery($galleries, $images) {