diff --git a/Gemfile b/Gemfile
index e87d83b..19d94bd 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,6 +1,6 @@
 source 'http://rubygems.org'
 
-gem 'rails', '3.1.1.rc1'
+gem 'rails', '3.1.1'
 
 # Bundle edge Rails instead:
 # gem 'rails',     :git => 'git://github.com/rails/rails.git'
@@ -18,6 +18,7 @@ gem 'nilify_blanks', '~> 1.0.0'
 gem 'rails_config', '~> 0.2.4'
 # gem 'rails-settings-cached', :require => 'rails-settings'
 gem 'active-model-email-validator', '~> 1.0.2'
+gem 'mail_form', '~> 1.3.0'
 gem 'capistrano', '~> 2.9.0'
 
 # Gems used only for assets and not required
diff --git a/Gemfile.lock b/Gemfile.lock
index 7ec42c6..e0e4b68 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -14,36 +14,36 @@ GIT
 GEM
   remote: http://rubygems.org/
   specs:
-    actionmailer (3.1.1.rc1)
-      actionpack (= 3.1.1.rc1)
+    actionmailer (3.1.1)
+      actionpack (= 3.1.1)
       mail (~> 2.3.0)
-    actionpack (3.1.1.rc1)
-      activemodel (= 3.1.1.rc1)
-      activesupport (= 3.1.1.rc1)
+    actionpack (3.1.1)
+      activemodel (= 3.1.1)
+      activesupport (= 3.1.1)
       builder (~> 3.0.0)
       erubis (~> 2.7.0)
       i18n (~> 0.6)
       rack (~> 1.3.2)
-      rack-cache (~> 1.0.3)
+      rack-cache (~> 1.1)
       rack-mount (~> 0.8.2)
       rack-test (~> 0.6.1)
-      sprockets (~> 2.0.0)
+      sprockets (~> 2.0.2)
     active-model-email-validator (1.0.2)
       activemodel
       mail
-    activemodel (3.1.1.rc1)
-      activesupport (= 3.1.1.rc1)
+    activemodel (3.1.1)
+      activesupport (= 3.1.1)
       builder (~> 3.0.0)
       i18n (~> 0.6)
-    activerecord (3.1.1.rc1)
-      activemodel (= 3.1.1.rc1)
-      activesupport (= 3.1.1.rc1)
+    activerecord (3.1.1)
+      activemodel (= 3.1.1)
+      activesupport (= 3.1.1)
       arel (~> 2.2.1)
       tzinfo (~> 0.3.29)
-    activeresource (3.1.1.rc1)
-      activemodel (= 3.1.1.rc1)
-      activesupport (= 3.1.1.rc1)
-    activesupport (3.1.1.rc1)
+    activeresource (3.1.1)
+      activemodel (= 3.1.1)
+      activesupport (= 3.1.1)
+    activesupport (3.1.1)
       multi_json (~> 1.0)
     arel (2.2.1)
     bcrypt-ruby (3.0.1)
@@ -85,16 +85,16 @@ GEM
     erubis (2.7.0)
     execjs (1.2.9)
       multi_json (~> 1.0)
-    factory_girl (2.1.2)
+    factory_girl (2.2.0)
       activesupport
-    factory_girl_rails (1.2.0)
-      factory_girl (~> 2.1.0)
+    factory_girl_rails (1.3.0)
+      factory_girl (~> 2.2.0)
       railties (>= 3.0.0)
     faker (1.0.1)
       i18n (~> 0.4)
     ffi (1.0.9)
     fssm (0.2.7)
-    guard (0.8.4)
+    guard (0.8.5)
       thor (~> 0.14.6)
     guard-rspec (0.4.5)
       guard (>= 0.4.0)
@@ -104,7 +104,7 @@ GEM
     highline (1.6.2)
     hike (1.2.1)
     i18n (0.6.0)
-    jquery-rails (1.0.14)
+    jquery-rails (1.0.16)
       railties (~> 3.0)
       thor (~> 0.14)
     json (1.6.1)
@@ -114,6 +114,7 @@ GEM
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
       treetop (~> 1.4.8)
+    mail_form (1.3.0)
     mime-types (1.16)
     multi_json (1.0.3)
     mysql2 (0.3.7)
@@ -133,7 +134,7 @@ GEM
       jquery-rails
     polyglot (0.3.2)
     rack (1.3.4)
-    rack-cache (1.0.3)
+    rack-cache (1.1)
       rack (>= 0.4)
     rack-mount (0.8.3)
       rack (>= 1.0.0)
@@ -141,19 +142,19 @@ GEM
       rack
     rack-test (0.6.1)
       rack (>= 1.0)
-    rails (3.1.1.rc1)
-      actionmailer (= 3.1.1.rc1)
-      actionpack (= 3.1.1.rc1)
-      activerecord (= 3.1.1.rc1)
-      activeresource (= 3.1.1.rc1)
-      activesupport (= 3.1.1.rc1)
+    rails (3.1.1)
+      actionmailer (= 3.1.1)
+      actionpack (= 3.1.1)
+      activerecord (= 3.1.1)
+      activeresource (= 3.1.1)
+      activesupport (= 3.1.1)
       bundler (~> 1.0)
-      railties (= 3.1.1.rc1)
+      railties (= 3.1.1)
     rails_config (0.2.4)
       activesupport (>= 3.0)
-    railties (3.1.1.rc1)
-      actionpack (= 3.1.1.rc1)
-      activesupport (= 3.1.1.rc1)
+    railties (3.1.1)
+      actionpack (= 3.1.1)
+      activesupport (= 3.1.1)
       rack-ssl (~> 1.3.2)
       rake (>= 0.8.7)
       rdoc (~> 3.4)
@@ -190,7 +191,7 @@ GEM
       rubyzip
     sentient_user (0.3.2)
     spork (0.9.0.rc9)
-    sprockets (2.0.2)
+    sprockets (2.0.3)
       hike (~> 1.2)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
@@ -228,10 +229,11 @@ DEPENDENCIES
   guard-rspec (~> 0.4.5)
   guard-spork (~> 0.3.0)
   jquery-rails
+  mail_form (~> 1.3.0)
   mysql2
   nilify_blanks (~> 1.0.0)
   pjax_rails (~> 0.1.10)
-  rails (= 3.1.1.rc1)
+  rails (= 3.1.1)
   rails_config (~> 0.2.4)
   rb-fsevent (~> 0.4.3.1)
   rspec-rails (~> 2.6.1)
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 9f85e43..cbf56fd 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -25,7 +25,7 @@ class ApplicationController < ActionController::Base
   end
   
   def client_remote_ip
-    request.env["HTTP_X_FORWARDED_FOR"]
+    @client_remote_ip ||= request.env["HTTP_X_FORWARDED_FOR"]
   end
   helper_method :client_remote_ip
   
diff --git a/app/controllers/as_controller.rb b/app/controllers/as_controller.rb
index 08cc408..82d0272 100644
--- a/app/controllers/as_controller.rb
+++ b/app/controllers/as_controller.rb
@@ -26,6 +26,7 @@ class AsController < ApplicationController
   def new_model
     model = beginning_of_chain.new
     model.name = nested_parent_record.name
+    model.content = client_remote_ip if client_remote_ip.present?
     model
   end