--- hover_preview.js	2010-05-16 20:47:57.388327198 -0700
+++ hover_preview.js.new	2010-05-16 20:48:07.980722534 -0700
@@ -30,12 +30,21 @@ Drupal.behaviors.HoverPreview = function
       .fadeIn("fast");            
     },
   function(){
-    this.title = this.t;  
-    $("#hover-preview").remove();
+    if (this.t) {
+      this.title = this.t;  
+    }
+	  $("#hover-preview").remove();
     }); 
   $("img.hover-preview").mousemove(function(e){
+    var posY;
+
+    if (e.pageY - $(window).scrollTop() + $('#hover-preview').height() >= $(window).height() ) {
+      posY = $(window).height() + $(window).scrollTop() - $('#hover-preview').height() - 15 ;
+    } else {
+      posY = e.pageY - 15;
+    }
     $("#hover-preview")
-      .css("top",(e.pageY - xOffset) + "px")
-      .css("left",(e.pageX + yOffset) + "px");
-  });     
+      .css("top",(posY) + "px")
+      .css("left",(e.pageX + 15) + "px");
+  }); 
 };