2 files changed, 5 insertions, 3 deletions
diff --git a/lib/redmine/wiki_formatting/markdown/formatter.rb b/lib/redmine/wiki_formatting/markdown/formatter.rb
index c7611d977..b5ee2c941 100644
--- a/lib/redmine/wiki_formatting/markdown/formatter.rb
+++ b/lib/redmine/wiki_formatting/markdown/formatter.rb
@@ -141,7 +141,8 @@ module Redmine
             :superscript => true,
             :no_intra_emphasis => true,
             :footnotes => true,
-            :lax_spacing => true
+            :lax_spacing => true,
+            :underline => true
           )
         end
       end
diff --git a/lib/redmine/wiki_formatting/markdown/html_parser.rb b/lib/redmine/wiki_formatting/markdown/html_parser.rb
index cee3a2f07..f34034093 100644
--- a/lib/redmine/wiki_formatting/markdown/html_parser.rb
+++ b/lib/redmine/wiki_formatting/markdown/html_parser.rb
@@ -23,8 +23,9 @@ module Redmine
         self.tags = tags.merge(
           'b' => {:pre => '**', :post => '**'},
           'strong' => {:pre => '**', :post => '**'},
-          'i' => {:pre => '_', :post => '_'},
-          'em' => {:pre => '_', :post => '_'},
+          'i' => {:pre => '*', :post => '*'},
+          'em' => {:pre => '*', :post => '*'},
+          'u' => {:pre => '_', :post => '_'},
           'strike' => {:pre => '~~', :post => '~~'},
           'h1' => {:pre => "\n\n# ", :post => "\n\n"},
           'h2' => {:pre => "\n\n## ", :post => "\n\n"},