Index: conffiles/etc/imapd/imapd.conf
===================================================================
--- conffiles/etc/imapd/imapd.conf      (revision 67815)
+++ conffiles/etc/imapd/imapd.conf      (working copy)
@@ -109,8 +109,8 @@
                print 'tls_ca_file: %s' % baseConfig.get('mail/cyrus/ssl/cafile')
 @!@
 tls_session_timeout: 1440
-tls_cipher_list: TLSv1:SSLv3:SSLv2:!NULL:!EXPORT:!DES:!LOW:@STRENGTH
 @!@
+print 'tls_cipher_list: %s' % baseConfig.get('mail/cyrus/ssl/cipher_list', 'TLSv1+HIGH:!aNULL:@STRENGTH')
 print "idlemethod: %s" % baseConfig.get('mail/cyrus/idlemethod', 'idled')
 @!@
 idlesocket: /var/run/cyrus/socket/idle