diff --git a/msgconv/from-meta.go b/msgconv/from-meta.go
index 685cb1c..b022675 100644
--- a/msgconv/from-meta.go
+++ b/msgconv/from-meta.go
@@ -62,7 +62,8 @@ func (cm *ConvertedMessage) MergeCaption() {
 	mediaContent := cm.Parts[0].Content
 	textContent := cm.Parts[1].Content
 	if mediaContent.FileName != "" && mediaContent.FileName != mediaContent.Body {
-		if textContent.FormattedBody != "" {
+		if textContent.FormattedBody != "" || mediaContent.FormattedBody != "" {
+			textContent.EnsureHasHTML()
 			mediaContent.EnsureHasHTML()
 			mediaContent.FormattedBody = fmt.Sprintf("%s<br><br>%s", mediaContent.FormattedBody, textContent.FormattedBody)
 		}