software-mansion
diff --git a/‎android/src/main/java/com/swmansion/enriched/common/parser/EnrichedParser.java‎
Lines changed: 10 additions & 2 deletions b/‎android/src/main/java/com/swmansion/enriched/common/parser/EnrichedParser.java‎
Lines changed: 10 additions & 2 deletions
diff --git a/‎ios/htmlParser/HtmlParser.mm‎
Lines changed: 17 additions & 2 deletions b/‎ios/htmlParser/HtmlParser.mm‎
Lines changed: 17 additions & 2 deletions
@@ -94,8 +94,9 @@ public static String toHtml(Spanned text) {
     String normalizedBlockQuote =
         normalizedCodeBlock.replaceAll("</blockquote>\\n<br>", "</blockquote>");
 
-    // Replace empty <p> tags (with or without style attributes) with <br>
-    String normalizedHtml = normalizedBlockQuote.replaceAll("<p[^>]*></p>", "<br>");
+    // Replace empty <p> tags with <br>, except when they carry text-align
+    String normalizedHtml =
+        normalizedBlockQuote.replaceAll("<p(?![^>]*text-align\\s*:)[^>]*></p>", "<br>");
 
     return "<html>\n" + normalizedHtml + "</html>";
   }
@@ -593,7 +594,14 @@ private void handleEndTag(String tag) {
     if (tag.equalsIgnoreCase("br")) {
       handleBr(mSpannableStringBuilder);
     } else if (tag.equalsIgnoreCase("p")) {
+      boolean empty = isEmptyTag;
+      Alignment pendingAlignment = empty ? getLast(mSpannableStringBuilder, Alignment.class) : null;
       endBlockElement(mSpannableStringBuilder, mSpanFactory);
+      // Plain empty paragraphs never reach setParagraphSpanFromMark (no ZWS).
+      // Represent them as a blank line so they round-trip as <br>.
+      if (empty && pendingAlignment == null) {
+        handleBr(mSpannableStringBuilder);
+      }
     } else if (tag.equalsIgnoreCase("ul")) {
       currentListAlignmentCssValue = null;
       endBlockElement(mSpannableStringBuilder, mSpanFactory);
 
@@ -957,7 +957,16 @@ + (NSString *)parseToHtmlFromRange:(NSRange)range
             inCheckboxList = NO;
           }
         } else {
-          [result appendString:@"\n<br>"];
+          NSString *cssStyleString =
+              [self prepareCssStyleString:currentRange.location
+                             isOpeningTag:YES
+                                     host:host];
+          if (cssStyleString.length > 0) {
+            [result appendString:[NSString stringWithFormat:@"\n<p%@></p>",
+                                                            cssStyleString]];
+          } else {
+            [result appendString:@"\n<br>"];
+          }
         }
       } else {
         // newline finishes a paragraph and all style tags need to be closed
@@ -1456,7 +1465,7 @@ + (NSString *)prepareCssStyleString:(NSInteger)location
 }
 
 + (void)checkForAlignments:(NSArray *)tagData
-                 plainText:(NSString *)plainText
+                 plainText:(NSMutableString *)plainText
            foundAlignments:(NSMutableArray<AlignmentEntry *> *)foundAlignments
        precedingImageCount:(NSInteger)precedingImageCount {
   if (tagData == nil) {
@@ -1474,6 +1483,12 @@ + (void)checkForAlignments:(NSArray *)tagData
     NSInteger actualStart = startLoc + precedingImageCount;
     NSInteger length = plainText.length - startLoc;
 
+    // Empty aligned paragraphs have no characters to attach alignment to.
+    if (length == 0) {
+      [plainText appendString:@"\u200B"];
+      length = 1;
+    }
+
     if (length > 0) {
       AlignmentEntry *entry = [[AlignmentEntry alloc] init];
       entry.alignment = align;