diff --git a/config/configuration.yml b/config/configuration.yml
index 2bdb88836..3a14fa5d7 100644
--- a/config/configuration.yml
+++ b/config/configuration.yml
@@ -85,12 +85,14 @@ default:
     delivery_method: :smtp
     smtp_settings:
       
-      address: smtp.163.com
-      port: 25
-      domain: smtp.163.com
-      authentication: :login
-      user_name: trustie2@163.com
-      password: PDLtrustie2
+   
+
+      address: smtp.gmail.com
+      port: 587
+      domain: smtp.gmail.com
+      authentication: :plain
+      user_name: trustieforge@gmail.com
+      password: '!@#$%^&*()'
 
   # Absolute path to the directory where attachments are stored.
   # The default is the 'files' directory in your Redmine instance.
diff --git a/config/settings.yml b/config/settings.yml
index d05a81828..3c22b1ad4 100644
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -56,7 +56,7 @@ activity_days_default:
 per_page_options:
   default: '25,50,100'
 mail_from:
-  default: trustie2@163.com
+  default: trustieforge@gmail.com
 bcc_recipients:
   default: 1
 plain_text_mail:
@@ -90,11 +90,6 @@ diff_max_lines_displayed:
 enabled_scm:
   serialized: true
   default:
-  - Subversion
-  - Darcs
-  - Mercurial
-  - Cvs
-  - Bazaar
   - Git
 autofetch_changesets:
   default: 1