minor fix

diff --git a/emailclient/po/Makefile.am b/emailclient/po/Makefile.am
index 9fe91c2..a1b8cd6 100644 (file)
--- a/emailclient/po/Makefile.am
+++ b/emailclient/po/Makefile.am
@@ -25,7 +25,7 @@ default: $(DOMAIN).pot $(LANGPO) merge $(LANGMO)
 
 merge:
        for lang in $(LANGS); do \
-               msgmerge --no-location -s -N -U $$lang.po $(DOMAIN).pot; \
+               msgmerge --no-location -s -U $$lang.po $(DOMAIN).pot; \
        done
 
 

diff --git a/emailclient/src/plugin.py b/emailclient/src/plugin.py
index b8cdc25..86a375b 100755 (executable)
--- a/emailclient/src/plugin.py
+++ b/emailclient/src/plugin.py
@@ -544,7 +544,7 @@ class ScreenMailView(Screen):
                        self.session.openWithCallback(self.deleteCB, ChoiceBox, title=_("really delete Mail?"), list=[(_("yes"), True),(_("no"), False)])
 
        def deleteCB(self, returnValue):
-               if returnValue[1] is True:
+               if returnValue and returnValue[1] is True:
                        if '\\Deleted' in self.flags:
                                self.proto.removeFlags(self.uid, ["\\Deleted"]).addCallback(self.cbOk).addErrback(self.cbNotOk)
                        else: