From 251f15a1d9dfc27533c19afa8da8b33296c72933 Mon Sep 17 00:00:00 2001
From: Thomas Oettli <spacefreak@noop.ch>
Date: Mon, 4 Oct 2021 13:18:53 +0200
Subject: [PATCH] some more fixes

---
 pyquarantine/config.py  | 5 ++++-
 pyquarantine/notify.py  | 2 +-
 pyquarantine/storage.py | 1 -
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/pyquarantine/config.py b/pyquarantine/config.py
index 827f742..f7526f1 100644
--- a/pyquarantine/config.py
+++ b/pyquarantine/config.py
@@ -197,7 +197,8 @@ class StoreConfig(BaseConfig):
                 "directory": {"type": "string"},
                 "mode": {"type": "string"},
                 "metavar": {"type": "string"},
-                "original": {"type": "boolean", "default": True}}}}
+                "metadata": {"type": "boolean", "default": False},
+                "original": {"type": "boolean", "default": False}}}}
 
 
 class NotifyConfig(BaseConfig):
@@ -245,6 +246,8 @@ class QuarantineConfig(BaseConfig):
     def __init__(self, config, rec=True):
         super().__init__(config)
         if rec:
+            if "metadata" not in self["store"]:
+                self["store"]["metadata"] = True
             self["store"] = StoreConfig(self["store"])
             if "notify" in self:
                 self["notify"] = NotifyConfig(self["notify"])
diff --git a/pyquarantine/notify.py b/pyquarantine/notify.py
index 783da5c..a43965d 100644
--- a/pyquarantine/notify.py
+++ b/pyquarantine/notify.py
@@ -266,7 +266,7 @@ class EMailNotification(BaseNotification):
             variables["ENVELOPE_TO_URL"] = escape(quote(recipient))
             for field in ["from", "to", "subject"]:
                 value = msg[field]
-                if not value:
+                if value is None:
                     continue
                 variables[field.upper()] = escape(value, quote=False)
 
diff --git a/pyquarantine/storage.py b/pyquarantine/storage.py
index d1b333c..1e4bb3c 100644
--- a/pyquarantine/storage.py
+++ b/pyquarantine/storage.py
@@ -362,7 +362,6 @@ class Quarantine:
             "pretend": cfg["pretend"],
             "type": "store",
             "args": cfg["args"]["store"].get_config()})
-        storage_cfg["args"]["metadata"] = True
         self._storage = Store(storage_cfg, local_addrs, debug)
 
         self.smtp_host = cfg["args"]["smtp_host"]