diff --git a/src/Cake.Issues.Reporting.Generic/Templates/DxDataGrid.cshtml b/src/Cake.Issues.Reporting.Generic/Templates/DxDataGrid.cshtml
index 980770a23..c8cc140c5 100644
--- a/src/Cake.Issues.Reporting.Generic/Templates/DxDataGrid.cshtml
+++ b/src/Cake.Issues.Reporting.Generic/Templates/DxDataGrid.cshtml
@@ -275,6 +275,25 @@
                 }
                 rowAlternationEnabled: true,
                 allowColumnResizing: true,
+                rowTemplate: function (container, item) {
+                    var data = item.data,
+                        markup = "<tbody class='issue dx-row " + ((item.rowIndex % 2) ? 'dx-row-alt' : '') + "'>" +
+                            "<tr class='main-row'>" +
+                            "<td>" + data.ProviderName + "</td>" +
+                            "<td>" + data.PriorityName + "</td>" +
+                            "<td>" + data.Project + "</td>" +
+                            "<td>" + data.Path + "</td>" +
+                            "<td>" + data.File + "</td>" +
+                            "<td>" + data.Line + "</td>" +
+                            "<td>" + data.Rule + "</td>" +
+                            "</tr>" +
+                            "<tr class='message-row'>" +
+                            "<td colspan='7'><div>" + data.Message + "</div></td>" +
+                            "</tr>" +
+                            "</tbody>";
+
+                    container.append(markup);
+                },
                 columns: [
                     @if (providerTypeVisible)
                     {
@@ -744,26 +763,6 @@
                             },
                         </text>
                     }
-                    @if (messageVisible)
-                    {
-                        <text>
-                            {
-                                caption: "Message",
-                                dataField: "MessageHtml",
-                                encodeHtml: false,
-                                visibleIndex: @((int)ReportColumn.Message),
-                                @if (groupedColumns.Contains(ReportColumn.Message))
-                                {
-                                    @:groupIndex: @groupedColumns.IndexOf(ReportColumn.Message),
-                                }
-                                @if (sortedColumns.Contains(ReportColumn.Message))
-                                {
-                                    @:sortIndex: @sortedColumns.IndexOf(ReportColumn.Message),
-                                    @:sortOrder: "@messageSortOrder.ToShortString()",
-                                }
-                            },
-                        </text>
-                    }
                     @foreach (var additionalColumn in additionalColumns)
                     {
                         <text>
@@ -797,4 +796,4 @@
         });
     </script>
 </body>
-</html>
\ No newline at end of file
+</html>