diff --git a/app/logbook/elog/src/main/java/org/phoebus/elog/api/ElogApi.java b/app/logbook/elog/src/main/java/org/phoebus/elog/api/ElogApi.java
index 752b137dc3..f6aa770a2a 100644
--- a/app/logbook/elog/src/main/java/org/phoebus/elog/api/ElogApi.java
+++ b/app/logbook/elog/src/main/java/org/phoebus/elog/api/ElogApi.java
@@ -198,7 +198,13 @@ public ElogEntry read( Long msgId ) throws LogbookException {
         attributes.put( data[0], data[1] );
       }
     }
-    attributes.put( "Text", String.join("\n", returned_msg.subList( delimiter_idx + 1, returned_msg.size() ) ) );
+
+    // Wrap text inside <p> tag if Encoding is "plain"
+    String textContent = String.join("\n", returned_msg.subList(delimiter_idx + 1, returned_msg.size()));
+    if( "plain".equalsIgnoreCase(attributes.get("Encoding")) ) {
+        textContent = "<p style=\"white-space: pre-wrap;\">" + textContent + "</p>";
+    }
+    attributes.put("Text", textContent);
 
     return new ElogEntry( attributes, attachments );
   }