diff --git a/activerecord/CHANGELOG b/activerecord/CHANGELOG
index adefc4a694..6e031edb60 100644
--- a/activerecord/CHANGELOG
+++ b/activerecord/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Fixed that when using validation macros with a custom message, if you happened to use single quotes in the message string you would get a parsing error #657 [tonka]
+
 * Fixed that Active Record would throw Broken Pipe errors with FCGI when the MySQL connection timed out instead of reconnecting #428 [Nicholas Seckar]
 
 * Added options to specify an SSL connection for MySQL. Define the following attributes in the connection config (config/database.yml in Rails) to use it: sslkey, sslcert, sslca, sslcapath, sslcipher. To use SSL with no client certs, just set :sslca = '/dev/null'. http://dev.mysql.com/doc/mysql/en/secure-connections.html #604 [daniel@nightrunner.com]
diff --git a/activerecord/lib/active_record/validations.rb b/activerecord/lib/active_record/validations.rb
index fc462bd4ae..a3cce5afa0 100755
--- a/activerecord/lib/active_record/validations.rb
+++ b/activerecord/lib/active_record/validations.rb
@@ -228,6 +228,7 @@ module ActiveRecord
       def validates_confirmation_of(*attr_names)
         configuration = { :message => ActiveRecord::Errors.default_error_messages[:confirmation], :on => :save }
         configuration.update(attr_names.pop) if attr_names.last.is_a?(Hash)
+        configuration[:message].gsub!(/\"/, '\\\\\"')
 
         for attr_name in attr_names
           attr_accessor "#{attr_name}_confirmation"
@@ -253,10 +254,11 @@ module ActiveRecord
       def validates_acceptance_of(*attr_names)
         configuration = { :message => ActiveRecord::Errors.default_error_messages[:accepted], :on => :save }
         configuration.update(attr_names.pop) if attr_names.last.is_a?(Hash)
+        configuration[:message].gsub!(/\"/, '\\\\\"')
 
         for attr_name in attr_names
           attr_accessor(attr_name)
-          class_eval(%(#{validation_method(configuration[:on])} %{errors.add('#{attr_name}', '#{configuration[:message]}') unless #{attr_name}.nil? or #{attr_name} == "1"}))
+          class_eval(%(#{validation_method(configuration[:on])} %{errors.add('#{attr_name}', "#{configuration[:message]}") unless #{attr_name}.nil? or #{attr_name} == "1"}))
         end
       end
 
@@ -268,6 +270,7 @@ module ActiveRecord
       def validates_presence_of(*attr_names)
         configuration = { :message => ActiveRecord::Errors.default_error_messages[:empty], :on => :save }
         configuration.update(attr_names.pop) if attr_names.last.is_a?(Hash)
+        configuration[:message].gsub!(/\"/, '\\\\\"')
 
         for attr_name in attr_names
           class_eval(%(#{validation_method(configuration[:on])} %{errors.add_on_empty('#{attr_name}', "#{configuration[:message]}")}))
@@ -411,12 +414,13 @@ module ActiveRecord
       def validates_uniqueness_of(*attr_names)
         configuration = { :message => ActiveRecord::Errors.default_error_messages[:taken] }
         configuration.update(attr_names.pop) if attr_names.last.is_a?(Hash)
+        configuration[:message].gsub!(/\"/, '\\\\\"')
 
         for attr_name in attr_names
           if scope = configuration[:scope]
-            class_eval(%(validate %{errors.add('#{attr_name}', '#{configuration[:message]}') if self.class.find_first(new_record? ? ['#{attr_name} = ? AND #{scope} = ?', #{attr_name}, #{scope}] : ["#{attr_name} = ? AND \\\#{self.class.primary_key} <> ? AND #{scope} = ?", #{attr_name}, id, #{scope}])}))
+            class_eval(%(validate %{errors.add('#{attr_name}', "#{configuration[:message]}") if self.class.find_first(new_record? ? ['#{attr_name} = ? AND #{scope} = ?', #{attr_name}, #{scope}] : ["#{attr_name} = ? AND \\\#{self.class.primary_key} <> ? AND #{scope} = ?", #{attr_name}, id, #{scope}])}))
           else
-            class_eval(%(validate %{errors.add('#{attr_name}', '#{configuration[:message]}') if self.class.find_first(new_record? ? ['#{attr_name} = ?', #{attr_name}] : ["#{attr_name} = ? AND \\\#{self.class.primary_key} <> ?", #{attr_name}, id])}))
+            class_eval(%(validate %{errors.add('#{attr_name}', "#{configuration[:message]}") if self.class.find_first(new_record? ? ['#{attr_name} = ?', #{attr_name}] : ["#{attr_name} = ? AND \\\#{self.class.primary_key} <> ?", #{attr_name}, id])}))
           end
         end
       end
@@ -437,6 +441,7 @@ module ActiveRecord
       def validates_format_of(*attr_names)
         configuration = { :message => ActiveRecord::Errors.default_error_messages[:invalid], :on => :save, :with => nil }
         configuration.update(attr_names.pop) if attr_names.last.is_a?(Hash)
+        configuration[:message].gsub!(/\"/, '\\\\\"')
 
         raise(ArgumentError, "A regular expression must be supplied as the :with option of the configuration hash") unless configuration[:with].is_a?(Regexp)
 
@@ -459,6 +464,8 @@ module ActiveRecord
       def validates_inclusion_of(*attr_names)
         configuration = { :message => ActiveRecord::Errors.default_error_messages[:inclusion], :on => :save }
         configuration.update(attr_names.pop) if attr_names.last.is_a?(Hash)
+        configuration[:message].gsub!(/\"/, '\\\\\"')
+
         enum = configuration[:in] || configuration[:within]
         allow_nil = configuration[:allow_nil]
 
@@ -497,6 +504,7 @@ module ActiveRecord
       def validates_associated(*attr_names)
         configuration = { :message => ActiveRecord::Errors.default_error_messages[:invalid], :on => :save }
         configuration.update(attr_names.pop) if attr_names.last.is_a?(Hash)
+        configuration[:message].gsub!(/\"/, '\\\\\"')
         
         for attr_name in attr_names
           class_eval(%(#{validation_method(configuration[:on])} %{
diff --git a/activerecord/test/validations_test.rb b/activerecord/test/validations_test.rb
index f03c7dfcae..9d7b8b987a 100755
--- a/activerecord/test/validations_test.rb
+++ b/activerecord/test/validations_test.rb
@@ -522,4 +522,86 @@ class ValidationsTest < Test::Unit::TestCase
     assert_equal 100, d.salary
     assert_equal "100,000", d.salary_before_type_cast
   end
+
+  def test_validates_acceptance_of_with_custom_error_using_quotes
+    Developer.validates_acceptance_of :salary, :message=> "This string contains 'single' and \"double\" quotes"
+    d = Developer.new
+    d.salary = "0"
+    assert !d.valid?
+    assert_equal d.errors.on(:salary).first, "This string contains 'single' and \"double\" quotes"
+  end
+
+  def test_validates_confirmation_of_with_custom_error_using_quotes
+    Developer.validates_confirmation_of :name, :message=> "This string contains 'single' and \"double\" quotes"
+    d = Developer.new
+    d.name = "John"
+    d.name_confirmation = "Johnny"
+    assert !d.valid?
+    assert_equal d.errors.on(:name), "This string contains 'single' and \"double\" quotes"
+  end
+
+  def test_validates_format_of_with_custom_error_using_quotes
+    Developer.validates_format_of :name, :with => /^(A-Z*)$/, :message=> "This string contains 'single' and \"double\" quotes"
+    d = Developer.new
+    d.name = "John 32"
+    assert !d.valid?
+    assert_equal d.errors.on(:name), "This string contains 'single' and \"double\" quotes"
+  end
+
+  def test_validates_inclusion_of_with_custom_error_using_quotes
+    Developer.validates_inclusion_of :salary, :in => 1000..80000, :message=> "This string contains 'single' and \"double\" quotes"
+    d = Developer.new
+    d.salary = "90,000"
+    assert !d.valid?
+    assert_equal d.errors.on(:salary).first, "This string contains 'single' and \"double\" quotes"
+  end
+
+  def test_validates_length_of_with_custom_too_long_using_quotes
+    Developer.validates_length_of :name, :maximum => 4, :too_long=> "This string contains 'single' and \"double\" quotes"
+    d = Developer.new
+    d.name = "Jeffrey"
+    assert !d.valid?
+    assert_equal d.errors.on(:name).first, "This string contains 'single' and \"double\" quotes"
+  end
+
+  def test_validates_length_of_with_custom_too_short_using_quotes
+    Developer.validates_length_of :name, :minimum => 4, :too_short=> "This string contains 'single' and \"double\" quotes"
+    d = Developer.new
+    d.name = "Joe"
+    assert !d.valid?
+    assert_equal d.errors.on(:name).first, "This string contains 'single' and \"double\" quotes"
+  end
+
+  def test_validates_length_of_with_custom_message_using_quotes
+    Developer.validates_length_of :name, :minimum => 4, :message=> "This string contains 'single' and \"double\" quotes"
+    d = Developer.new
+    d.name = "Joe"
+    assert !d.valid?
+    assert_equal d.errors.on(:name).first, "This string contains 'single' and \"double\" quotes"
+  end
+
+  def test_validates_presence_of_with_custom_message_using_quotes
+    Developer.validates_presence_of :non_existent, :message=> "This string contains 'single' and \"double\" quotes"
+    d = Developer.new
+    d.name = "Joe"
+    assert !d.valid?
+    assert_equal d.errors.on(:non_existent), "This string contains 'single' and \"double\" quotes"
+  end
+
+  def test_validates_uniqueness_of_with_custom_message_using_quotes
+    Developer.validates_uniqueness_of :name, :message=> "This string contains 'single' and \"double\" quotes"
+    d = Developer.new
+    d.name = "David"
+    assert !d.valid?
+    assert_equal d.errors.on(:name).first, "This string contains 'single' and \"double\" quotes"
+  end
+
+  def test_validates_associated_with_custom_message_using_quotes
+    Reply.validates_associated :topic, :message=> "This string contains 'single' and \"double\" quotes"
+    Topic.validates_presence_of :content
+    r = Reply.create("title" => "A reply", "content" => "with content!")
+    r.topic = Topic.create("title" => "uhohuhoh")
+    assert !r.valid?
+    assert_equal r.errors.on(:topic).first, "This string contains 'single' and \"double\" quotes"
+  end
 end