diff --git a/lib/gollum-lib/filter/macro.rb b/lib/gollum-lib/filter/macro.rb
index defd7d4c..2023b3f9 100644
--- a/lib/gollum-lib/filter/macro.rb
+++ b/lib/gollum-lib/filter/macro.rb
@@ -4,7 +4,7 @@
 # Replace specified tokens with dynamically generated content.
 class Gollum::Filter::Macro < Gollum::Filter
   def extract(data)
-    quoted_arg   = %r{".*?"}
+    quoted_arg   = %r{".*?(?<!\\)"} # use a negative lookbehind to not terminate on a " preceeded by \
     unquoted_arg = %r{[^,)]+}
     named_arg    = %r{[a-z0-9_]+=".*?"}
     
@@ -26,7 +26,7 @@ def extract(data)
         if argument =~ /^([a-z0-9_]+)="(.*?)"/
       		opts[Regexp.last_match[1]] = Regexp.last_match[2]
 			  elsif argument =~ /^"(.*)"$/
-      		args << Regexp.last_match[1]
+				  args << Regexp.last_match[1].gsub("\\\"", "\"")
 			  else
 				  args << argument
         end
diff --git a/test/test_macros.rb b/test/test_macros.rb
index ae9aab05..9c53444d 100644
--- a/test/test_macros.rb
+++ b/test/test_macros.rb
@@ -127,6 +127,11 @@ def render(opts)
     assert_match(/@\(bar\)@/, @wiki.pages[0].formatted_data)
   end
 
+  test "ListArgs with escaped quotation mark in quoted args" do
+    @wiki.write_page("ListArgsMacroPage", :markdown, '<<ListArgs("Goodbye \"cruel\" world")>>', commit_details)
+    assert_match(/@Goodbye "cruel" world@/, @wiki.pages[0].formatted_data)
+  end
+
   test "ListArgs with a mix or arg styles" do
     @wiki.write_page("ListArgsMacroPage", :markdown, '<<ListArgs("foo, bar, and baz", wombat, funny things)>>', commit_details)
     assert_match(/@foo, bar, and baz@/, @wiki.pages[0].formatted_data)