diff --git a/.travis.yml b/.travis.yml
index efe3ffc6..2b0f551c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,13 @@
 language: ruby
 sudo: false
 cache: bundler
+addons:
+  postgresql: '10'
+services:
+  - mysql
+branches:
+  only: 
+    - master
 bundler_args: --without development
 before_script:
   - "sh -e /etc/init.d/xvfb start"
@@ -8,24 +15,16 @@ before_script:
 script:
   - "DISPLAY=:99.0 bundle exec rspec spec"
 notifications:
-  email: true
   irc:
     use_notice: true
     skip_join: true
     channels:
       - "irc.freenode.org#refinerycms"
-  campfire:
-    on_success: always
-    on_failure: always
-    rooms:
-      - secure: "JaX+Ckvdd2wqL2bD6t8PHvMDBHxWBlCrkBKPcDKxV0t0DOwzzzwxMryVqcRi\nPsmM/zvmWFATDyRmivhNOpu4lRg9RytSroxZ9nkmbLDqjCyEAZ6tv4yZXME/\nPaxPwmfwgS9g8TKjj3lSWS7rEpqqg0D5S0XIfIHrj6KB6LUmFHc="
   webhooks:
   - https://webhooks.gitter.im/e/b5d48907cdc89864b874
 env:
   - DB=postgresql
   - DB=mysql
 rvm:
-  - 2.5.1
-  - 2.4.4
-  - 2.3.7
+  - 2.6
 
diff --git a/refinerycms-inquiries.gemspec b/refinerycms-inquiries.gemspec
index bbd28fae..4d3a92bd 100644
--- a/refinerycms-inquiries.gemspec
+++ b/refinerycms-inquiries.gemspec
@@ -18,7 +18,7 @@ Gem::Specification.new do |s|
   s.add_dependency  'mobility'
   s.add_dependency  'refinerycms-settings', '~> 4.0'
   s.add_dependency  'filters_spam',         '~> 0.2'
-  s.add_dependency  'actionmailer',        ['>= 5.1.0', '< 5.3']
+  s.add_dependency  'actionmailer',        ['>= 5.1.0', '< 7']
   s.add_dependency  'httpclient'
 
   s.cert_chain      = [File.expand_path("../certs/parndt.pem", __FILE__)]