diff --git a/lib/redmine/wiki_formatting/html_parser.rb b/lib/redmine/wiki_formatting/html_parser.rb
index 62445ff3b..b3b45f590 100644
--- a/lib/redmine/wiki_formatting/html_parser.rb
+++ b/lib/redmine/wiki_formatting/html_parser.rb
@@ -30,7 +30,7 @@ module Redmine
       }
 
       def self.to_text(html)
-        html = html.gsub(/[\n\r]/, '').squeeze(' ')
+        html = html.gsub(/^\s+/, '').tr("\n\r", '').squeeze(' ')
     
         doc = Loofah.document(html)
         doc.scrub!(WikiTags.new(tags))
diff --git a/lib/redmine/wiki_formatting/markdown/html_parser.rb b/lib/redmine/wiki_formatting/markdown/html_parser.rb
index d3900a2bd..74469b3df 100644
--- a/lib/redmine/wiki_formatting/markdown/html_parser.rb
+++ b/lib/redmine/wiki_formatting/markdown/html_parser.rb
@@ -34,7 +34,9 @@ module Redmine
           'h3' => {:pre => "\n\n### ", :post => "\n\n"},
           'h4' => {:pre => "\n\n#### ", :post => "\n\n"},
           'h5' => {:pre => "\n\n##### ", :post => "\n\n"},
-          'h6' => {:pre => "\n\n###### ", :post => "\n\n"}
+          'h6' => {:pre => "\n\n###### ", :post => "\n\n"},
+          'th' => {:pre => '*', :post => "*\n"},
+          'td' => {:pre => '', :post => "\n"}
         )
       end
     end
diff --git a/lib/redmine/wiki_formatting/textile/html_parser.rb b/lib/redmine/wiki_formatting/textile/html_parser.rb
index 35215a336..58397f9a0 100644
--- a/lib/redmine/wiki_formatting/textile/html_parser.rb
+++ b/lib/redmine/wiki_formatting/textile/html_parser.rb
@@ -34,7 +34,9 @@ module Redmine
           'h3' => {:pre => "\n\nh3. ", :post => "\n\n"},
           'h4' => {:pre => "\n\nh4. ", :post => "\n\n"},
           'h5' => {:pre => "\n\nh5. ", :post => "\n\n"},
-          'h6' => {:pre => "\n\nh6. ", :post => "\n\n"}
+          'h6' => {:pre => "\n\nh6. ", :post => "\n\n"},
+          'th' => {:pre => '*', :post => "*\n"},
+          'td' => {:pre => '', :post => "\n"}
         )
       end
     end