diff --git a/share/templates/roundcubemail/config.inc.php.tpl b/share/templates/roundcubemail/config.inc.php.tpl
index 9f7d0a4..aa05536 100644
--- a/share/templates/roundcubemail/config.inc.php.tpl
+++ b/share/templates/roundcubemail/config.inc.php.tpl
@@ -1,245 +1,235 @@
 <?php
     \$config = array();
 
     \$config['db_dsnw'] = '$mysql_uri';
 
     \$config['session_domain'] = '';
     \$config['des_key'] = "$des_key";
     \$config['username_domain'] = '$primary_domain';
     \$config['use_secure_urls'] = true;
     \$config['assets_path'] = '/roundcubemail/assets/';
     \$config['assets_dir'] = '/usr/share/roundcubemail/public_html/assets/';
 
     \$config['mail_domain'] = '';
 
     // IMAP Server Settings
     \$config['default_host'] = 'tls://localhost';
     \$config['default_port'] = 143;
     \$config['imap_delimiter'] = '/';
     \$config['imap_force_lsub'] = true;
 
     // IMAP Connection TLS settings, adjust for Production
     \$config['imap_conn_options'] = Array(
             'ssl' => Array(
                     'verify_peer_name' => false,
                     'verify_peer' => false,
                     'allow_self_signed' => true
                 )
         );
 
     // Caching and storage settings
     \$config['imap_cache'] = 'db';
     \$config['imap_cache_ttl'] = '10d';
     \$config['messages_cache'] = 'db';
     \$config['message_cache_ttl'] = '10d';
     \$config['session_storage'] = 'db';
 
     // SMTP Server Settings
     \$config['smtp_server'] = 'tls://localhost';
     \$config['smtp_port'] = 587;
     \$config['smtp_user'] = '%u';
     \$config['smtp_pass'] = '%p';
     \$config['smtp_helo_host'] = \$_SERVER["HTTP_HOST"];
 
     // SMTP Connection TLS settings, adjust for Production
     \$config['smtp_conn_options'] = Array(
             'ssl' => Array(
                     'verify_peer_name' => false,
                     'verify_peer' => false,
                     'allow_self_signed' => true
                 )
         );
 
-    // ManageSieve Settings
-    // ManageSieve Connection TLS settings, adjust for Production
-    \$config['managesieve_conn_options'] = Array(
-            'ssl' => Array(
-                    'verify_peer_name' => false,
-                    'verify_peer' => false,
-                    'allow_self_signed' => true
-                )
-        );
-
     // LDAP Settings
     \$config['ldap_cache'] = 'db';
     \$config['ldap_cache_ttl'] = '1h';
 
     // Kolab specific defaults
     \$config['product_name'] = 'Kolab Groupware';
     \$config['quota_zero_as_unlimited'] = false;
     \$config['login_lc'] = 2;
     \$config['auto_create_user'] = true;
     \$config['enable_installer'] = false;
     // The SMTP server does not allow empty identities
     \$config['mdn_use_from'] = true;
 
     // Plugins
     \$config['plugins'] = array(
             'kolab_auth',
             'acl',
             'archive',
             'calendar',
             'jqueryui',
             'kolab_activesync',
             'kolab_addressbook',
             'kolab_config',
             'kolab_delegation',
             'kolab_files',
             'kolab_folders',
             'kolab_notes',
             'kolab_tags',
             'libkolab',
             'libcalendaring',
             'managesieve',
             'newmail_notifier',
             'odfviewer',
             'password',
             'redundant_attachments',
             'tasklist',
             // contextmenu must be after kolab_addressbook (#444)
             'contextmenu',
         );
 
 
     // Do not show deleted messages, mark deleted messages as read,
     // and flag them as deleted instead of moving them to the Trash
     // folder.
     \$config['skip_deleted'] = true;
     \$config['read_when_deleted'] = true;
     \$config['flag_for_deletion'] = true;
     \$config['delete_always'] = true;
 
     \$config['session_lifetime'] = 180;
     \$config['password_charset'] = 'UTF-8';
     \$config['useragent'] = 'Kolab 3.4/Roundcube ' . RCUBE_VERSION;
 
     \$config['message_sort_col'] = 'date';
 
     \$config['spellcheck_dictionary'] = true;
     \$config['spellcheck_ignore_caps'] = true;
     \$config['spellcheck_ignore_nums'] = true;
     \$config['spellcheck_ignore_syms'] = true;
 
     \$config['undo_timeout'] = 10;
     \$config['upload_progress'] = 2;
     \$config['address_template'] = '{street}<br/>{locality} {zipcode}<br/>{country} {region}';
     \$config['preview_pane'] = true;
     \$config['preview_pane_mark_read'] = 0;
 
     \$config['autoexpand_threads'] = 2;
     \$config['top_posting'] = 0;
     \$config['sig_above'] = false;
     \$config['mdn_requests'] = 0;
     \$config['mdn_default'] = false;
     \$config['dsn_default'] = false;
     \$config['reply_same_folder'] = false;
 
     if (file_exists(RCUBE_CONFIG_DIR . '/' . \$_SERVER["HTTP_HOST"] . '/' . basename(__FILE__))) {
         include_once(RCUBE_CONFIG_DIR . '/' . \$_SERVER["HTTP_HOST"] . '/' . basename(__FILE__));
     }
 
     // Re-apply mandatory settings here.
 
     \$config['debug_level'] = 1;
     \$config['devel_mode'] = false;
     \$config['log_driver'] = 'file';
     \$config['log_date_format'] = 'd-M-Y H:i:s,u O';
     \$config['syslog_id'] = 'roundcube';
     \$config['syslog_facility'] = LOG_USER;
     \$config['smtp_log'] = false;
     \$config['log_logins'] = true;
     \$config['log_session'] = false;
     \$config['sql_debug'] = false;
     \$config['memcache_debug'] = false;
     \$config['imap_debug'] = false;
     \$config['ldap_debug'] = false;
     \$config['smtp_debug'] = false;
 
     \$config['skin'] = '$skin';
     \$config['skin_include_php'] = false;
     \$config['mime_magic'] = null;
     \$config['im_identify_path'] = '/usr/bin/identify';
     \$config['im_convert_path'] = '/usr/bin/convert';
     \$config['log_dir'] = 'logs/';
     \$config['temp_dir'] = '/var/lib/roundcubemail/';
 
     // Some additional default folders (archive plugin)
     \$config['archive_mbox'] = 'Archive';
     // The Kolab daemon by default creates 'Spam'
     \$config['junk_mbox'] = 'Spam';
     \$config['default_folders'] = array('INBOX', 'Drafts', 'Sent', 'Spam', 'Trash', 'Archive');
 
     \$config['address_book_type'] = 'ldap';
     \$config['autocomplete_min_length'] = 3;
     \$config['autocomplete_threads'] = 0;
     \$config['autocomplete_max'] = 15;
     \$config['ldap_public'] = array(
             'kolab_addressbook' => array(
                     'name'                      => 'Global Address Book',
                     'hosts'                     => Array('localhost'),
                     'port'                      => 389,
                     'use_tls'                   => false,
                     'base_dn'                   => '$ldap_user_base_dn',
                     'user_specific'             => true,
                     'bind_dn'                   => '%dn',
                     'bind_pass'                 => '',
                     'search_base_dn'            => '$ldap_user_base_dn',
                     'search_bind_dn'            => '$ldap_service_bind_dn',
                     'search_bind_pw'            => '$ldap_service_bind_pw',
                     'search_filter'             => '(&(objectClass=inetOrgPerson)(mail=%fu))',
                     'writable'                  => false,
                     'LDAP_Object_Classes'       => array("top", "inetOrgPerson"),
                     'required_fields'           => array("cn", "sn", "mail"),
                     'LDAP_rdn'                  => 'uid',
                     'ldap_version'              => 3,       // using LDAPv3
                     'search_fields'             => array('displayname', 'mail'),
                     'sort'                      => array('displayname', 'sn', 'givenname', 'cn'),
                     'scope'                     => 'sub',
                     'filter'                    => '(objectClass=inetOrgPerson)',
                     'vlv'                       => false,
                     'vlv_search'                => false,
                     'fuzzy_search'              => true,
                     'sizelimit'                 => '0',
                     'timelimit'                 => '0',
                     'fieldmap'                  => Array(
                             // Roundcube        => LDAP
                             'name'              => 'displayName',
                             'surname'           => 'sn',
                             'firstname'         => 'givenName',
                             'middlename'        => 'initials',
                             'prefix'            => 'title',
                             'email:primary'     => 'mail',
                             'email:alias'       => 'alias',
                             'email:personal'    => 'mailalternateaddress',
                             'phone:main'        => 'telephoneNumber',
                             'phone:work'        => 'alternateTelephoneNumber',
                             'phone:mobile'      => 'mobile',
                             'phone:work2'       => 'blackberry',
                             'jobtitle'          => 'title',
                             'manager'           => 'manager',
                             'assistant'         => 'secretary',
                             'photo'             => 'jpegphoto'
                         ),
                     'groups'                    => Array(
                             'base_dn'           => '$ldap_group_base_dn',
                             'filter'            => '(&' . '$ldap_group_filter' . '(mail=*))',
                             'object_classes'    => Array("top", "groupOfUniqueNames"),
                             'member_attr'       => 'uniqueMember',
                         ),
                 ),
         );
 
     \$config['autocomplete_addressbooks'] = Array(
             'kolab_addressbook'
         );
 
     \$config['autocomplete_single'] = true;
 
     \$config['htmleditor'] = 0;
 
     \$config['kolab_http_request'] = Array(
             'ssl_verify_host' => false,
             'ssl_verify_peer' => false,
         );
 
 ?>
diff --git a/share/templates/roundcubemail/managesieve.inc.php.tpl b/share/templates/roundcubemail/managesieve.inc.php.tpl
index 780125e..9c37b2a 100644
--- a/share/templates/roundcubemail/managesieve.inc.php.tpl
+++ b/share/templates/roundcubemail/managesieve.inc.php.tpl
@@ -1,22 +1,31 @@
 <?php
     \$config['managesieve_port'] = 4190;
     \$config['managesieve_host'] = '%h';
     \$config['managesieve_auth_type'] = 'PLAIN';
     \$config['managesieve_auth_cid'] = null;
     \$config['managesieve_auth_pw'] = null;
     \$config['managesieve_usetls'] = true;
     \$config['managesieve_default'] = '/etc/dovecot/sieve/global';
     \$config['managesieve_mbox_encoding'] = 'UTF-8';
     \$config['managesieve_replace_delimiter'] = '';
     \$config['managesieve_disabled_extensions'] = array();
     \$config['managesieve_debug'] = false;
     \$config['managesieve_vacation'] = 1;
 
     \$config['managesieve_filename_extension'] = '';
     \$config['managesieve_kolab_master'] = true;
 
+    // ManageSieve Connection TLS settings, adjust for Production
+    \$config['managesieve_conn_options'] = Array(
+            'ssl' => Array(
+                    'verify_peer_name' => false,
+                    'verify_peer' => false,
+                    'allow_self_signed' => true
+                )
+        );
+
     if (file_exists(RCUBE_CONFIG_DIR . '/' . \$_SERVER["HTTP_HOST"] . '/' . basename(__FILE__))) {
         include_once(RCUBE_CONFIG_DIR . '/' . \$_SERVER["HTTP_HOST"] . '/' . basename(__FILE__));
     }
 
 ?>