diff --git a/mod/hotpot/iframe.js b/mod/hotpot/iframe.js
index 6185f98f6cd43..2b41ab9f4419e 100644
--- a/mod/hotpot/iframe.js
+++ b/mod/hotpot/iframe.js
@@ -1,52 +1,57 @@
-<!--
 function domSniffer() {
-	var t = true;
-	var s = navigator.userAgent;
-	if (s.indexOf("Mac") >=0) this.mac = t;
-	if (s.indexOf("Opera") >=0) this.opera = t;
-	var d = document;
-	if (d.layers) this.n4 = t;
-	if (d.childNodes) this.dom = t;
-	if (d.all && d.plugins) this.ie = t;
+    var t = true;
+    var s = navigator.userAgent;
+    if (s.indexOf("Mac") >=0) this.mac = t;
+    if (s.indexOf("Opera") >=0) this.opera = t;
+    var d = document;
+    if (d.layers) this.n4 = t;
+    if (d.childNodes) this.dom = t;
+    if (d.all && d.plugins) this.ie = t;
 }
 function getContentH(lyr) {
-	return (is.n4) ? lyr.document.height : (is.ie) ? (is.mac ? lyr.offsetHeight : lyr.scrollHeight) : (is.opera) ? lyr.style.pixelHeight : (is.dom) ? lyr.offsetHeight : 0;
+    return (is.n4) ? lyr.document.height : (is.ie) ? (is.mac ? lyr.offsetHeight : lyr.scrollHeight) : (is.opera) ? lyr.style.pixelHeight : (is.dom) ? lyr.offsetHeight : 0;
 }
 function px(i) {
-	return i + "px";
+    return i + "px";
 }
 function setSize(obj, w, h) {
-	if (is.n4) {
-		if (w) obj.width = w;
-		if (h) obj.height = h;
-	} else if (is.opera) {
-		// opera 5 needs pixelWidth/Height
-		if (w) obj.style.pixelWidth = w;
-		if (h) obj.style.pixelHeight = h;
-	} else {
-		if (w) obj.style.width = px(w);
-		if (h) obj.style.height = px(h);
-	}
+    if (is.n4) {
+        if (w) obj.width = w;
+        if (h) obj.height = h;
+    } else if (is.opera) {
+        // opera 5 needs pixelWidth/Height
+        if (w) obj.style.pixelWidth = w;
+        if (h) obj.style.pixelHeight = h;
+    } else {
+        if (w) obj.style.width = px(w);
+        if (h) obj.style.height = px(h);
+    }
 }
 function getElement(id, lyr) {
-	var d = (document.layers && lyr) ? lyr.document : document;
-	var obj = (document.layers) ? eval("d."+id) : (d.all) ? d.all[id] : (d.getElementById) ? d.getElementById(id) : null;
-	return obj;
+    var d = (document.layers && lyr) ? lyr.document : document;
+    var obj = (document.layers) ? eval("d."+id) : (d.all) ? d.all[id] : (d.getElementById) ? d.getElementById(id) : null;
+    return obj;
 }
-is = new domSniffer();
-function set_iframe_height(id) {
-	var iframe = getElement(id);
-	if (iframe) {
-		var obj = iframe.document || iframe.contentDocument || null; // IE || FireFox
-		if (obj) {
-			if (obj.body) {
-				obj = obj.body;
-			}
-			var h = getContentH(obj);
-			if (h) {
-				setSize(iframe, 0, h);
-			}
-		}
-	}
+function set_object_height(myObject) {
+    if (myObject) {
+        if (document.frames) {
+            var obj = myObject; // IE - obj is alaredy a document element
+        } else {
+            var obj = myObject.document || myObject.contentDocument || null; // IE || FireFox
+        }
+        if (obj) {
+            if (obj.body) {
+                obj = obj.body;
+            }
+            var h = getContentH(obj);
+            if (h) {
+                setSize(myObject, 0, h + 65);
+            }
+            if (document.all) {
+                myObject.allowTransparency = true;
+                obj.style.backgroundColor = 'transparent';
+            }
+        }
+    }
 }
-//-->
+is = new domSniffer();
\ No newline at end of file
diff --git a/mod/hotpot/view.php b/mod/hotpot/view.php
index 0f04e8a9c3326..8ab0e1f3c7c69 100644
--- a/mod/hotpot/view.php
+++ b/mod/hotpot/view.php
@@ -141,6 +141,7 @@
             // HP5 v5
             $get_html = empty($framename) ? true : false;
         }
+        
         if ($get_html) {
 
             if (HOTPOT_FIRST_ATTEMPT) {
@@ -163,8 +164,43 @@
                         $hp->insert_giveup_form($attemptid, '<!-- BeginTopNavButtons -->', '<!-- EndTopNavButtons -->');
                         break;
                     case HOTPOT_NAVIGATION_FRAME:
-                        $targetframe = $CFG->framename;
-                        // drop through to remove nav buttons too
+                    case HOTPOT_NAVIGATION_IFRAME:
+                        if (empty($CFG->framename)) {
+                            $targetframe = '_top';
+                        } else {
+                            $targetframe = $CFG->framename;
+                        }
+                        if ($pos = strpos($hp->html, '</body>')) {
+                            $insert = ''
+                                .'<script type="text/javascript">'."\n"
+                                .'//<![CDATA['."\n"
+                                ."var obj = document.getElementsByTagName('a');\n"
+                                ."if (obj) {\n"
+                                ."	var i_max = obj.length;\n"
+                                ."	for (var i=0; i<i_max; i++) {\n"
+                                ."		if (obj[i].href && ! obj[i].target) {\n"
+                                ."			obj[i].target = '$targetframe';\n"
+                                ."		}\n"
+                                ."	}\n"
+                                ."	var obj = null;\n"
+                                ."}\n"
+                                ."var obj = document.getElementsByTagName('form');\n"
+                                ."if (obj) {\n"
+                                ."	var i_max = obj.length;\n"
+                                ."	for (var i=0; i<i_max; i++) {\n"
+                                ."		if (obj[i].action && ! obj[i].target) {\n"
+                                ."			obj[i].target = '$targetframe';\n"
+                                ."		}\n"
+                                ."	}\n"
+                                ."	var obj = null;\n"
+                                ."}\n"
+                                .'//]]>'."\n"
+                                .'</script>'."\n"
+                            ;
+                            $hp->html = substr_replace($hp->html, $insert, $pos, 0);
+                        }
+                        $hp->remove_nav_buttons();
+                        break;
                     default:
                         $hp->remove_nav_buttons();
                 }
@@ -375,7 +411,8 @@
     switch ($hotpot->navigation) {
         case HOTPOT_NAVIGATION_BAR:
             //update_module_button($cm->id, $course->id, $strmodulename.'" style="font-size:0.8em')
-            print_header($title, $heading, $navigation, "", $head.$styles.$scripts, true, $button, $loggedinas, false, $body_tags
+            print_header(
+                $title, $heading, $navigation, "", $head.$styles.$scripts, true, $button, $loggedinas, false, $body_tags
             );
             if (!empty($available_msg)) {
                 notify($available_msg);
@@ -423,25 +460,41 @@
             switch ($framename) {
                 case 'main':
                     print $hp->html;
-                break;
+               break;
                 default:
+                    // set iframe attributes
                     $iframe_id = 'hotpot_iframe';
-                    $body_tags = " onload=\"set_iframe_height('$iframe_id')\"";
-                    $iframe_js = '<script src="iframe.js" type="text/javascript"></script>'."\n";
+                    $iframe_src = $CFG->wwwroot.'/mod/hotpot/view.php?id='.$cm->id.'&amp;framename=main';
+                    $iframe_onload_function = 'set_object_height';
+                    $iframe_js = '<script src="'.$CFG->wwwroot.'/mod/hotpot/iframe.js" type="text/javascript"></script>'."\n";
                     print_header(
                         $title, $heading, $navigation,
                         "", $head.$styles.$scripts.$iframe_js, true, $button,
-                        $loggedinas, false, $body_tags
+                        $loggedinas, false
                     );
                     if (!empty($available_msg)) {
                         notify($available_msg);
                     }
-                    print "<iframe id=\"$iframe_id\" src=\"view.php?id=$cm->id&amp;framename=main\" height=\"100%\" width=\"100%\">";
-                    print "<ilayer name=\"$iframe_id\" src=\"view.php?id=$cm->id&amp;framename=main\" height=\"100%\" width=\"100%\">";
-                    print "</ilayer>\n";
-                    print "</iframe>\n";
+
+                    // the object to hold the embedded html page
+                    print '<object id="'.$iframe_id.'" type="text/html" data="'.$iframe_src.'" width="100%" height="100%" onload="'.$iframe_onload_function.'(this)"></object>'."\n";
+
+                    // javascript to simulate object onload event in IE (thanks to David Horat !)
+                    print '<script type="text/javascript">'."\n";
+                    print '//<![CDATA['."\n";
+                    print 'function ieOnload(id, fn) {'."\n";
+                    print '	if (document.all[id].readyState==4) {'."\n";
+                    print '		clearInterval(ieOnloadInterval);'."\n";
+                    print '		fn(document.all[id]);'."\n";
+                    print '	}'."\n";
+                    print '}'."\n";
+                    print 'if (document.all) {'."\n";
+                    print '	var ieOnloadInterval = setInterval("ieOnload('."'$iframe_id',$iframe_onload_function".')", 100);'."\n";
+                    print '}'."\n";
+                    print '//]]>'."\n";
+                    print '</script>'."\n";
+
                     print $footer;
-                break;
             } // end switch $framename
         break;
         case HOTPOT_NAVIGATION_GIVEUP: