diff --git a/js/expand.js b/js/expand.js
index 05aece95..d78cea9a 100644
--- a/js/expand.js
+++ b/js/expand.js
@@ -35,6 +35,7 @@ $(document).ready(function(){
 								}
 								last_expanded = $(this);
 								
+								$(document).trigger('new_post', this);
 							}
 						});
 						$('<span class="omitted"><a href="javascript:void(0)">Hide expanded replies</a>.</span>')
diff --git a/js/inline-expanding.js b/js/inline-expanding.js
index ec7978a7..ef84e806 100644
--- a/js/inline-expanding.js
+++ b/js/inline-expanding.js
@@ -6,41 +6,50 @@
  * Copyright (c) 2012 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[0].src && link[i].className != 'file') {
-			link[i].childNodes[0].style.maxWidth = '95%';
-			link[i].onclick = function(e) {
-				if(e.which == 2) {
-					return true;
-				}
-				if(!this.tag) {
-					this.tag = this.childNodes[0].src;
-					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 = '1';
-						this.style.filter = '';
+		for(var i = 0; i < link.length; i++) {
+			if(typeof link[i] == "object" && link[i].childNodes[0].src && link[i].className != 'file') {
+				link[i].childNodes[0].style.maxWidth = '95%';
+				link[i].onclick = function(e) {
+					if(e.which == 2) {
+						return true;
 					}
-				} else {
-					this.childNodes[0].src = this.tag;
-					this.childNodes[0].style.width = 'auto';
-					this.childNodes[0].style.height = 'auto';
-					this.tag = '';
+					if(!this.tag) {
+						this.tag = this.childNodes[0].src;
+						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 = '1';
+							this.style.filter = '';
+						}
+					} else {
+						this.childNodes[0].src = this.tag;
+						this.childNodes[0].style.width = 'auto';
+						this.childNodes[0].style.height = 'auto';
+						this.tag = '';
+					}
+					return false;
 				}
-				return false;
 			}
-			
 		}
 	}
+
+        $('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);
+        });
 });
 
diff --git a/js/show-backlinks.js b/js/show-backlinks.js
index e6e17e4f..4ead494b 100644
--- a/js/show-backlinks.js
+++ b/js/show-backlinks.js
@@ -46,5 +46,9 @@ onready(function(){
 	};
 	
 	$('div.post.reply').each(showBackLinks);
+
+        $(document).bind('new_post', function(e, post) {
+		showBackLinks.call(post);
+	});
 });