diff --git a/src/message_ast/convert_matrix.rs b/src/message_ast/convert_matrix.rs
index 2b29ac3..5d0ef07 100644
--- a/src/message_ast/convert_matrix.rs
+++ b/src/message_ast/convert_matrix.rs
@@ -53,7 +53,8 @@ pub fn convert_matrix(message: &str) -> MessageContent {
             NodeEdge::End(node) => match node.data() {
                 NodeData::Text(text) => {
                     if !skip_text {
-                        components.push(MessageComponent::Plain(text.borrow().clone()));
+                        let text = text.borrow().lines().collect::<Vec<_>>().join(" ");
+                        components.push(MessageComponent::Plain(text));
                     }
                 }
                 NodeData::Element(element) => {
@@ -96,7 +97,7 @@ pub fn convert_matrix(message: &str) -> MessageContent {
                                     components = parent_components;
                                 }
                             }
-                            local_name!("br") => {
+                            local_name!("br") | local_name!("p") => {
                                 components.push(MessageComponent::HardBreak);
                             }
                             local_name!("blockquote") => {