diff --git a/galleryscript.js b/galleryscript.js
index d1b9a5e..71346ae 100644
--- a/galleryscript.js
+++ b/galleryscript.js
@@ -1097,7 +1097,11 @@ function thumblist(n,curr) {
            ' <span class="menuitem" id="setupbutton" onclick="usersetupflip()">(S)etup</span>';
     thumbstr='<div><span class="headsmall">Images</span>'+menustr+'</div><div id="thumbrow">'+leftstr;
     for (i=ends.first; i<ends.last; i++) {
-        thumbstr+='<span id="n'+i+'" class="imagebox thumbbox"><img class="thumbimage" title="'+titlestring(imagedesc[i])+'" onclick="showimage('+String(i)+')" src="_tn/tn_'+encodeURIComponent(imagelist[i])+'.jpg"><br/><a href="'+encodeURIComponent(imagelist[i])+'" target="_blank" title="'+titlestring(imagedesc[i])+'">'+nicestring((imagelist[i]))+'</a></span>';
+        if (isHTML(imagelist[i])) {
+            thumbstr+='<span id="n'+i+'" class="imagebox thumbbox"><img class="thumbimage" title="'+titlestring(imagedesc[i])+'" onclick="showimage('+String(i)+')" ><br/><a href="'+encodeURIComponent(imagelist[i])+'" target="_blank" title="'+titlestring(imagedesc[i])+'">'+nicestring((imagelist[i]))+'</a></span>';
+        } else {
+            thumbstr+='<span id="n'+i+'" class="imagebox thumbbox"><img class="thumbimage" title="'+titlestring(imagedesc[i])+'" onclick="showimage('+String(i)+')" src="_tn/tn_'+encodeURIComponent(imagelist[i])+'.jpg"><br/><a href="'+encodeURIComponent(imagelist[i])+'" target="_blank" title="'+titlestring(imagedesc[i])+'">'+nicestring((imagelist[i]))+'</a></span>';
+        }
     }
     thumbstr+=rightstr+'</div>';
     $('#thumbcontainer').html(thumbstr);
@@ -1459,7 +1463,7 @@ function getmaxthumbs() {
 }
 
 function isHTML(s) {
-    return s.match(/html$/i);
+    return s.match(/htm.?$/i);
 }
 
 function hidethumbs() {
diff --git a/gallerystyle.css b/gallerystyle.css
index a9ebff8..03fbdd1 100644
--- a/gallerystyle.css
+++ b/gallerystyle.css
@@ -201,6 +201,9 @@ input {
 img {
     border: 0px;
 }
+iframe {
+    border: 1px inset;
+}
 #arrowleft,#arrowright {
     width: 40px;
     height: 90px;