diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php
index cd54242164..d6bff9ab5b 100644
--- a/include/bb2diaspora.php
+++ b/include/bb2diaspora.php
@@ -17,8 +17,8 @@ function diaspora2bb($s) {
 
 	$s = html_entity_decode($s, ENT_COMPAT, 'UTF-8');
 
-	// Remove CR to avoid problems with following code
-	$s = str_replace("\r", '', $s);
+	// Handles single newlines
+	$s = str_replace("\r", '<br>', $s);
 
 	$s = str_replace("\n", " \n", $s);