FIX: do not encode mail body; FIX: send subject with email

src/modules/api/communicator/create.rs

@@ -42,7 +42,8 @@ pub fn create_email(mq: &State<Arc<MailQueue>>, settings: &State<Settings>, cook
 
     let mut mail = Message::builder()
         .from(settings.mail.from.clone().parse().unwrap())
-        .reply_to(settings.mail.reply_to.clone().parse().unwrap());
+        .reply_to(settings.mail.reply_to.clone().parse().unwrap())
+        .subject(maildata.subject);
 
     if let Some(receivers) = maildata.to {
         for receiver in receivers {

src/modules/api/events/requests/update.rs

@@ -2,7 +2,7 @@ use std::sync::Arc;
 
 use chrono::NaiveDateTime;
 use lettre::Message;
-use lettre::message::Mailbox;
+use lettre::message::{header, Mailbox};
 use rocket::serde::json::Json;
 use rocket::State;
 
@@ -207,7 +207,7 @@ fn send_event_request_published_emails(mt: &State<MailTemplates>, mq: &State<Arc
             support_email: settings.application.user_support_email.clone(),
             organiser: organiser.clone(),
         };
-        let mail = mail.body(match mt.registry.render("new_event_request_published-de", &nerpe) {
+        let mail = mail.header(header::ContentType::TEXT_PLAIN).body(match mt.registry.render("new_event_request_published-de", &nerpe) {
             Ok(body) => body,
             Err(e) => {
                 error!("Couldn't render email template: {}", e);
@@ -215,10 +215,7 @@ fn send_event_request_published_emails(mt: &State<MailTemplates>, mq: &State<Arc
             },
         }).unwrap();
 
-        match mq.add_mail(mail){
-            Ok(_) => {},
-            Err(_) => {}
-        }
+        mq.add_mail(mail);
     }
 
 }

src/modules/welcome/controller/password_reset.rs

@@ -1,6 +1,7 @@
 use std::sync::Arc;
 
 use lettre::Message;
+use lettre::message::header;
 use rocket::State;
 
 use crate::database::controller::password_resets::add_token;
@@ -50,6 +51,7 @@ pub fn request_password_reset(settings: &State<Settings>, mt: &State<MailTemplat
         .reply_to(settings.mail.reply_to.clone().parse().unwrap())
         .to(email_address)
         .subject("Einsatz Online - Passwort Zurücksetzen") //TODO: use application name setting
+        .header(header::ContentType::TEXT_PLAIN)
         .body(body).unwrap();
 
     match mq.add_mail(mail) {