diff --git a/Gemfile b/Gemfile
index ac1f681..c38b7a4 100644
--- a/Gemfile
+++ b/Gemfile
@@ -41,6 +41,7 @@ group :development do
   gem 'better_errors'
   gem "binding_of_caller"
   gem 'yaml_db'
+  gem 'letter_opener'
 end
 
 group :test, :development do
diff --git a/Gemfile.lock b/Gemfile.lock
index 5f74297..f058ff9 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -55,6 +55,7 @@ GEM
       rdiscount (~> 1.3)
       wikicloth
       wikitext (~> 2.0)
+    addressable (2.3.4)
     arel (3.0.2)
     aws-sdk (1.8.1.1)
       json (~> 1.4)
@@ -116,6 +117,10 @@ GEM
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
     json (1.7.7)
+    launchy (2.3.0)
+      addressable (~> 2.3)
+    letter_opener (1.1.1)
+      launchy (~> 2.2)
     mail (2.5.3)
       i18n (>= 0.4.0)
       mime-types (~> 1.16)
@@ -242,6 +247,7 @@ DEPENDENCIES
   haml
   hpricot
   jquery-rails
+  letter_opener
   newrelic_rpm
   paperclip
   pg
diff --git a/config/environments/development.rb b/config/environments/development.rb
index ead02ca..fab8c47 100644
--- a/config/environments/development.rb
+++ b/config/environments/development.rb
@@ -28,16 +28,7 @@ DanBarberPhoto::Application.configure do
   # Expands the lines which load the assets
   config.assets.debug = true
 
-  config.action_mailer.delivery_method = :smtp
-  config.action_mailer.smtp_settings = {
-    :address              => "smtp.gmail.com",
-    :port                 => 587,
-    :domain               => 'danbee.co.uk',
-    :user_name            => 'webapps@danbee.co.uk',
-    :password             => 'fy-qua-paqu-rhuh-quok-py',
-    :authentication       => 'plain',
-    :enable_starttls_auto => true
-  }
+  config.action_mailer.delivery_method = :letter_opener
 
   config.action_mailer.default_url_options = { :host => "danbarberphoto.dev" }