diff --git a/gazelle-proxy-common-war/src/main/webapp/messages/commonDownload.xhtml b/gazelle-proxy-common-war/src/main/webapp/messages/commonDownload.xhtml
index 9c41d58a2332037dfb281cfe92ae520ccfc42945..7f441fdf048f3655eb85d37a630ab068f63a8826 100644
--- a/gazelle-proxy-common-war/src/main/webapp/messages/commonDownload.xhtml
+++ b/gazelle-proxy-common-war/src/main/webapp/messages/commonDownload.xhtml
@@ -93,13 +93,14 @@
         </h:panelGroup>
 
         <h:form id="insertForm">
+            <h:panelGroup rendered="#{messageBean.shouldDisplayHL7MessageContent()}">
+                <pre><h:outputText value="#{messageBean.message.getMessageReceivedAsString()}"/></pre>
+            </h:panelGroup>
+            <h:panelGroup rendered="#{!messageBean.shouldDisplayHL7MessageContent()}">
             <div style="font-family: monospace;" class="well">
                 <gdk:insert rendered="#{messageBean.shouldDisplayMessageContent()}"
                             content="#{messageBean.prettyFormat(messageBean.message.getMessageReceivedAsString())}"
                             highlight="xml"/>
-                <gdk:insert rendered="#{messageBean.shouldDisplayHL7MessageContent()}"
-                            content="#{messageBean.message.getMessageReceivedAsString()}"
-                            highlight="xml"/>
                 <gdk:insert rendered="#{messageBean.shouldDisplayDicomMessageContent()}"
                             content="#{messageBean.message.getDicomMessageReceivedAsString()}"/>
                 <h:outputText id="text"
@@ -109,6 +110,7 @@
                             content="#{messageBean.message.getRawMessageReceivedAsString()}"
                             highlight="beanshell"/>
             </div>
+            </h:panelGroup>
         </h:form>
 
     </s:decorate>