diff --git a/vendor/plugins/maruku/lib/maruku/string_utils.rb b/vendor/plugins/maruku/lib/maruku/string_utils.rb
index d297cd43..e58f715a 100644
--- a/vendor/plugins/maruku/lib/maruku/string_utils.rb
+++ b/vendor/plugins/maruku/lib/maruku/string_utils.rb
@@ -46,7 +46,7 @@ module MaRuKu; module Strings
 	#
 	def parse_email_headers(s)
 		keys={}
-		match = (s =~ /\A((\w[\w\s\_\-]+: .*\n)+)\s*\n/)
+		match = (s =~ /\A((\w[\w \t\_\-]+: .*?\n)+)\s*?\n/)
 		if match != 0
 			keys[:data] = s
 		else