diff --git a/include/bbcode.php b/include/bbcode.php
index 081e4b7c6b..e63a8d394e 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -267,9 +267,11 @@ function bb_ShareAttributes($match) {
         preg_match('/posted="(.*?)"/ism', $attributes, $matches);
         if ($matches[1] != "")
                 $posted = $matches[1];
-		$reldate = (($posted) ? " " . relative_date($posted) : '');
 
-        $headline = '<br /><div class="shared_header">';
+	$reldate = (($posted) ? " " . relative_date($posted) : '');
+
+	$headline = '<div class="shared_header">';
+        //$headline = '<br /><div class="shared_header">';
 
 	if ($avatar != "")
 		$headline .= '<img src="'.$avatar.'" height="32" width="32" >';
diff --git a/index.php b/index.php
index 3255a80517..87795ade70 100644
--- a/index.php
+++ b/index.php
@@ -494,13 +494,15 @@ var num = $pageno;
 
 $(window).scroll(function(e){
 
-	// First method that is expected to work - but has problems with Chrome
-	if ($(window).scrollTop() == $(document).height() - $(window).height())
-		loadcontent();
-
-	// This method works with Chrome
-	if ($(window).scrollTop() > (($("section").height() + $("header").height() + $("footer").height()) - $(window).height()))
-		loadcontent();
+	if ($(document).height() != $(window).height()) {
+		// First method that is expected to work - but has problems with Chrome
+		if ($(window).scrollTop() == $(document).height() - $(window).height())
+			loadcontent();
+	} else {
+		// This method works with Chrome - but seems to be much slower in Firefox
+		if ($(window).scrollTop() > (($("section").height() + $("header").height() + $("footer").height()) - $(window).height()))
+			loadcontent();
+	}
 });
 </script>