diff --git a/js/inline-expanding.js b/js/inline-expanding.js
index 2e924f05..06d3f76f 100644
--- a/js/inline-expanding.js
+++ b/js/inline-expanding.js
@@ -6,49 +6,62 @@
  * Copyright (c) 2012-2013 Michael Save <savetheinternet@tinyboard.org>
  *
  * Usage:
+ *   // $config['additional_javascript'][] = 'js/jquery.min.js';
  *   $config['additional_javascript'][] = 'js/inline-expanding.js';
  *
  */
 
 onready(function(){
-	var link = document.getElementsByTagName('a');
+	var inline_expand_post = function() {
+		var link = this.getElementsByTagName('a');
 	
-	for (var i = 0; i < link.length; i++) {
-		if (typeof link[i] == "object" && link[i].childNodes && link[i].childNodes[0].src && link[i].className != 'file') {
-			link[i].childNodes[0].style.maxWidth = '95%';
-			link[i].childNodes[0].style.maxHeight = '95%';
-			link[i].onclick = function(e) {
-				if (this.childNodes[0].className == 'hidden')
-					return false;
-				if (e.which == 2)
-					return true;
-				if (!this.dataset.src) {
-					this.dataset.expanded = 'true';
-					this.dataset.src= this.childNodes[0].src;
-					this.dataset.width = this.childNodes[0].style.width;
-					this.dataset.height = this.childNodes[0].style.height;
-					this.childNodes[0].src = this.href;
-					this.childNodes[0].style.width = 'auto';
-					this.childNodes[0].style.height = 'auto';
-					this.childNodes[0].style.opacity = '0.4';
-					this.childNodes[0].style.filter = 'alpha(opacity=40)';
-					this.childNodes[0].onload = function() {
-						this.style.opacity = '';
-						delete this.style.filter;
+		for (var i = 0; i < link.length; i++) {
+			if (typeof link[i] == "object" && link[i].childNodes && typeof link[i].childNodes[0] !== 'undefined' && link[i].childNodes[0].src && link[i].className != 'file') {
+				link[i].childNodes[0].style.maxWidth = '95%';
+				link[i].onclick = function(e) {
+					if (this.childNodes[0].className == 'hidden')
+						return false;
+					if (e.which == 2)
+						return true;
+					if (!this.dataset.src) {
+						this.dataset.expanded = 'true';
+						this.dataset.src= this.childNodes[0].src;
+						this.dataset.width = this.childNodes[0].style.width;
+						this.dataset.height = this.childNodes[0].style.height;
+						this.childNodes[0].src = this.href;
+						this.childNodes[0].style.width = 'auto';
+						this.childNodes[0].style.height = 'auto';
+						this.childNodes[0].style.opacity = '0.4';
+						this.childNodes[0].style.filter = 'alpha(opacity=40)';
+						this.childNodes[0].onload = function() {
+							this.style.opacity = '';
+							delete this.style.filter;
+						}
+					} else {
+						this.childNodes[0].src = this.dataset.src;
+						this.childNodes[0].style.width = this.dataset.width;
+						this.childNodes[0].style.height = this.dataset.height;
+						delete this.dataset.expanded;
+						delete this.dataset.src;
+						delete this.childNodes[0].style.opacity;
+						delete this.childNodes[0].style.filter;
 					}
-				} else {
-					this.childNodes[0].src = this.dataset.src;
-					this.childNodes[0].style.width = this.dataset.width;
-					this.childNodes[0].style.height = this.dataset.height;
-					delete this.dataset.expanded;
-					delete this.dataset.src;
-					delete this.childNodes[0].style.opacity;
-					delete this.childNodes[0].style.filter;
+					return false;
 				}
-				return false;
 			}
-			
 		}
 	}
+
+	if (window.jQuery) {
+		$('div[id^="thread_"]').each(inline_expand_post);
+		               
+		// allow to work with auto-reload.js, etc.
+		$(document).bind('new_post', function(e, post) {
+			inline_expand_post.call(post);
+		});
+	} else {
+		inline_expand_post.call(document);
+	}
+
 });