diff --git a/src/smtp/mod.rs b/src/smtp/mod.rs
index 7b3a081dc..1776f46a6 100644
--- a/src/smtp/mod.rs
+++ b/src/smtp/mod.rs
@@ -13,8 +13,8 @@ use crate::events::Event;
 use crate::login_param::{dc_build_tls, LoginParam};
 use crate::oauth2::*;
 
-/// SMTP write and read times out after 15 minutes.
-const SMTP_TIMEOUT: u64 = 15 * 60;
+/// SMTP write and read timeout in seconds.
+const SMTP_TIMEOUT: u64 = 30;
 
 #[derive(Debug, Fail)]
 pub enum Error {