From 479f87e2cab02b8a850ff71ee5a6ea42dbf007b0 Mon Sep 17 00:00:00 2001
From: Charles Lindsay <chaz@yorba.org>
Date: Wed, 12 Mar 2014 16:36:09 -0700
Subject: [PATCH] Default to STARTTLS in SMTP

Closes: bgo #714882
---
 src/client/accounts/add-edit-page.vala | 4 ++--
 ui/login.glade                         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/client/accounts/add-edit-page.vala b/src/client/accounts/add-edit-page.vala
index df349e63..61997edd 100644
--- a/src/client/accounts/add-edit-page.vala
+++ b/src/client/accounts/add-edit-page.vala
@@ -335,8 +335,8 @@ public class AddEditPage : Gtk.Box {
         bool initial_default_imap_starttls = false,
         string? initial_default_smtp_host = null,
         uint16 initial_default_smtp_port = Geary.Smtp.ClientConnection.DEFAULT_PORT_SSL,
-        bool initial_default_smtp_ssl = true,
-        bool initial_default_smtp_starttls = false,
+        bool initial_default_smtp_ssl = false,
+        bool initial_default_smtp_starttls = true,
         bool initial_default_smtp_use_imap_credentials = false,
         bool initial_default_smtp_noauth = false,
         int prefetch_period_days = Geary.AccountInformation.DEFAULT_PREFETCH_PERIOD_DAYS,
diff --git a/ui/login.glade b/ui/login.glade
index f8476c54..160fc6f2 100644
--- a/ui/login.glade
+++ b/ui/login.glade
@@ -661,7 +661,7 @@
               <object class="GtkComboBoxText" id="combo: smtp encryption">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="active">1</property>
+                <property name="active">2</property>
                 <property name="entry_text_column">0</property>
                 <property name="id_column">1</property>
                 <items>