diff --git a/include/bbcode.php b/include/bbcode.php
index a0a53a310..4647b8567 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -259,6 +259,7 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
 		$Text = str_replace(array("\n","\r"), array('',''),$Text);
 
 
+	$Text = str_replace(array("\t","  "),array("    ","  "),$Text);
 
 	// Set up the parameters for a URL search string
 	$URLSearchString = "^\[\]";