diff --git a/app/config/config.yml b/app/config/config.yml
index 61fd3f258e..4d48c0a049 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -97,6 +97,7 @@ assetic:
 swiftmailer:
     transport: '%mailer_transport%'
     host: '%mailer_host%'
+    port: '%mailer_port%'
     username: '%mailer_user%'
     password: '%mailer_password%'
     spool: { type: memory }
diff --git a/app/config/default_parameters.yml b/app/config/default_parameters.yml
index 366963e87f..cf8eea0dc6 100644
--- a/app/config/default_parameters.yml
+++ b/app/config/default_parameters.yml
@@ -16,6 +16,7 @@ parameters:
 
     # Setting for mail system, used by SwiftMailer
     mailer_host: '%env(MAILER_HOST)%'
+    mailer_port: '%env(MAILER_PORT)%'
     mailer_user: '%env(MAILER_USER)%'
     mailer_password: '%env(MAILER_PASSWORD)%'
 
@@ -35,8 +36,8 @@ parameters:
 
     # Cache DSN, see app/config/services/cache.yml for examples:
     cache_dsn: '%env(CACHE_DSN)%'
-    
-    # Cache namespace prefix for use with Redis/Memcached, 'ez' by default. 
+
+    # Cache namespace prefix for use with Redis/Memcached, 'ez' by default.
     # For further info incl alternatives for "blue/green deployment" and multi repo installs, see: app/config/cache_pool/*.yml
     cache_namespace: '%env(CACHE_NAMESPACE)%'
 
@@ -55,36 +56,6 @@ parameters:
     ez_recommendation.default.yoochoose.license_key: '%env(RECOMMENDATIONS_LICENSE_KEY)%'
     ez_recommendation.default.server_uri: '%env(PUBLIC_SERVER_URI)%'
 
-    # Fallback values for when environment variables do not exist
-
-    env(MAILER_HOST):       127.0.0.1
-    env(MAILER_USER):       ~
-    env(MAILER_PASSWORD):   ~
-
-    env(SEARCH_ENGINE): legacy
-
-    env(SOLR_DSN): http://localhost:8983/solr
-    env(SOLR_CORE): collection1
-
-    env(LOG_PATH): "%kernel.logs_dir%/%kernel.environment%.log"
-
-    env(CACHE_POOL): "cache.app"
-
-    env(CACHE_DSN): localhost
-
-    env(CACHE_NAMESPACE): ez
-
-    env(HTTPCACHE_PURGE_SERVER): "http://localhost:80"
-
-    env(HTTPCACHE_DEFAULT_TTL): 86400
-
-    env(SESSION_SAVE_PATH): '%kernel.project_dir%/var/sessions/%kernel.environment%'
-
-    env(RECOMMENDATIONS_CUSTOMER_ID):   ~
-    env(RECOMMENDATIONS_LICENSE_KEY):   ~
-    env(PUBLIC_SERVER_URI):             ~
-
-
     # Compile time handlers
     ## These are defined at compile time, and hence can't be set at runtime using env()
     ## app/config/env/generic.php takes care about letting you set them by env variables
diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist
index e59727075a..3bccc3ac58 100644
--- a/app/config/parameters.yml.dist
+++ b/app/config/parameters.yml.dist
@@ -15,3 +15,33 @@ parameters:
     env(DATABASE_NAME): ezplatform
     env(DATABASE_USER): root
     env(DATABASE_PASSWORD):
+
+    # Fallback values for when environment variables do not exist
+
+    env(MAILER_HOST):       127.0.0.1
+    env(MAILER_PORT):       ~
+    env(MAILER_USER):       ~
+    env(MAILER_PASSWORD):   ~
+
+    env(SEARCH_ENGINE): legacy
+
+    env(SOLR_DSN): http://localhost:8983/solr
+    env(SOLR_CORE): collection1
+
+    env(LOG_PATH): "%kernel.logs_dir%/%kernel.environment%.log"
+
+    env(CACHE_POOL): "cache.app"
+
+    env(CACHE_DSN): localhost
+
+    env(CACHE_NAMESPACE): ez
+
+    env(HTTPCACHE_PURGE_SERVER): "http://localhost:80"
+
+    env(HTTPCACHE_DEFAULT_TTL): 86400
+
+    env(SESSION_SAVE_PATH): '%kernel.project_dir%/var/sessions/%kernel.environment%'
+
+    env(RECOMMENDATIONS_CUSTOMER_ID):   ~
+    env(RECOMMENDATIONS_LICENSE_KEY):   ~
+    env(PUBLIC_SERVER_URI):             ~