diff --git a/e107_handlers/e_parse_class.php b/e107_handlers/e_parse_class.php
index 044f80bbf..2d3a4c5de 100644
--- a/e107_handlers/e_parse_class.php
+++ b/e107_handlers/e_parse_class.php
@@ -4647,6 +4647,7 @@ return;
 		        $value = preg_replace('/^<pre[^>]*>/', '', $value);
 		        $value = str_replace("</pre>", "", $value);
 		        $value = str_replace('<br></br>', PHP_EOL, $value);
+
 		    }
 
 		    if($node->nodeName == 'code')
@@ -4662,6 +4663,16 @@ return;
 		    $newNode = $doc->createElement($node->nodeName);
 		    $newNode->nodeValue = $value;
 
+		    if($class = $node->getAttribute('class'))
+		    {
+		        $newNode->setAttribute('class',$class);
+		    }
+
+	        if($style = $node->getAttribute('style'))
+		    {
+		        $newNode->setAttribute('style',$style);
+		    }
+
 		    $node->parentNode->replaceChild($newNode, $node);
        }