diff --git a/include/bbcode.php b/include/bbcode.php
index db3a1011b..2d86bd263 100644
--- a/include/bbcode.php
+++ b/include/bbcode.php
@@ -769,6 +769,8 @@ function bbcode($Text, $preserve_nl = false, $tryoembed = true, $cache = false)
 	}
 	// Check for list text
 	$Text = str_replace("[*]", "<li>", $Text);
+	$Text = str_replace("[]", "<li><input class=\"listcheckbox\" type=\"checkbox\" disabled=\"disabled\">", $Text);
+	$Text = str_replace("[x]", "<li><input class=\"listcheckbox\" type=\"checkbox\" checked=\"checked\" disabled=\"disabled\">", $Text);
 
  	// handle nested lists
 	$endlessloop = 0;
diff --git a/view/css/conversation.css b/view/css/conversation.css
index 6c5171545..fe89e2536 100644
--- a/view/css/conversation.css
+++ b/view/css/conversation.css
@@ -319,3 +319,8 @@ img.smiley.emoji:hover {
 	width: 32px;
 	height: 32px;
 }
+
+input.listcheckbox {
+	margin: 0px;
+	vertical-align: middle;
+}