From 4925f93c674607cd2d9cee77b933bdf3cf0dcb1f Mon Sep 17 00:00:00 2001
From: Nico de Haen <mail@ndh-websolutions.de>
Date: Thu, 28 Feb 2019 09:30:42 +0100
Subject: [PATCH] Load passwords in settings form

---
 src/renderer/components/Login.js            | 4 ----
 src/renderer/components/dialogs/Settings.js | 8 ++++++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/renderer/components/Login.js b/src/renderer/components/Login.js
index c52f3289dc..78e0223917 100644
--- a/src/renderer/components/Login.js
+++ b/src/renderer/components/Login.js
@@ -51,10 +51,6 @@ class Login extends React.Component {
 
   handleSubmit (event) {
     let config = this.state.credentials
-    if (!this.state.ui.showAdvanced) {
-      // ignore advanced settings
-      config = { mailPw: config.mailPw, addr: config.addr }
-    }
     this.props.onSubmit(config)
     event.preventDefault()
   }
diff --git a/src/renderer/components/dialogs/Settings.js b/src/renderer/components/dialogs/Settings.js
index 1b6581564b..c6eaff9f4a 100644
--- a/src/renderer/components/dialogs/Settings.js
+++ b/src/renderer/components/dialogs/Settings.js
@@ -53,6 +53,8 @@ class Settings extends React.Component {
     if (this.props.isOpen && !prevProps.isOpen) {
       const settings = ipcRenderer.sendSync(
         'getConfigFor', [
+          'addr',
+          'mail_pw',
           'inbox_watch',
           'sentbox_watch',
           'mvbox_watch',
@@ -63,6 +65,7 @@ class Settings extends React.Component {
           'configured_mail_port',
           'configured_mail_security',
           'configured_send_user',
+          'configured_send_pw',
           'configured_send_server',
           'configured_send_port',
           'configured_send_security',
@@ -159,7 +162,7 @@ class Settings extends React.Component {
 
   render () {
     const { deltachat, isOpen, onClose } = this.props
-    const { userDetails, advancedSettings, saved, keyTransfer } = this.state
+    const { userDetails, settings, advancedSettings, saved, keyTransfer } = this.state
     const tx = window.translate
     const title = tx('menu_settings')
     return (
@@ -175,7 +178,8 @@ class Settings extends React.Component {
               <Login
                 {...advancedSettings}
                 mode={'update'}
-                addr={deltachat.credentials.addr}
+                addr={settings.addr}
+                mailPw={settings.mail_pw}
                 onSubmit={this.onLoginSubmit}
                 loading={deltachat.configuring}
                 addrDisabled>