diff --git a/module/bug/css/view.css b/module/bug/css/view.css
index 9dbb2122ba..e23e5a1fdf 100644
--- a/module/bug/css/view.css
+++ b/module/bug/css/view.css
@@ -1 +1 @@
-.content .stepTitle{display:block; color: green}
+.content .stepTitle{display:block; color: green; margin:0px;}
diff --git a/module/bug/view/view.html.php b/module/bug/view/view.html.php
index 04813a1557..91aefb6273 100644
--- a/module/bug/view/view.html.php
+++ b/module/bug/view/view.html.php
@@ -68,7 +68,21 @@
     <div class='main'>
       <fieldset>
         <legend><?php echo $lang->bug->legendSteps;?></legend>
-        <div class='content'><?php echo str_replace('<p>[', '<p class="stepTitle">[', $bug->steps);?></div>
+        <div class='content'>
+          <?php
+          $tplStep = strip_tags(trim($lang->bug->tplStep));
+          $steps   = str_replace('<p>' . $tplStep, '<p class="stepTitle">' . $tplStep . '</p><p>', $bug->steps);
+
+          $tplResult = strip_tags(trim($lang->bug->tplResult));
+          $steps     = str_replace('<p>' . $tplResult, '<p class="stepTitle">' . $tplResult . '</p><p>', $steps);
+
+          $tplExpect = strip_tags(trim($lang->bug->tplExpect));
+          $steps     = str_replace('<p>' . $tplExpect, '<p class="stepTitle">' . $tplExpect . '</p><p>', $steps);
+
+          $steps = str_replace('<p></p>', '', $steps);
+          echo $steps;
+          ?>
+        </div>
       </fieldset>
       <?php echo $this->fetch('file', 'printFiles', array('files' => $bug->files, 'fieldset' => 'true'));?>
       <?php include '../../common/view/action.html.php';?>