diff options
| author | Patrick Totzke <patricktotzke@gmail.com> | 2012-05-21 15:11:25 +0100 |
|---|---|---|
| committer | Patrick Totzke <patricktotzke@gmail.com> | 2012-05-21 15:11:25 +0100 |
| commit | 66d5856ff3bcf498472d2a5fb4194c9e9ab7bbc9 (patch) | |
| tree | 7d547479bf43b2916c42598d7ba1f6f888fe52fd /alot | |
| parent | 4cf058625ae9cb096923a7cdf9c763c7f02feaa4 (diff) | |
| parent | ed3b2d4e086dd4781d746356af3f5fa7b62e4268 (diff) | |
Merge branch 'master' of github.com:pazz/alot
Diffstat (limited to 'alot')
| -rw-r--r-- | alot/__init__.py | 2 | ||||
| -rw-r--r-- | alot/commands/globals.py | 5 |
2 files changed, 4 insertions, 3 deletions
diff --git a/alot/__init__.py b/alot/__init__.py index 95db9832..5094531b 100644 --- a/alot/__init__.py +++ b/alot/__init__.py @@ -1,5 +1,5 @@ __productname__ = 'alot' -__version__ = '0.3.1' +__version__ = '0.3.1+' __copyright__ = "Copyright (C) 2012 Patrick Totzke" __author__ = "Patrick Totzke" __author_email__ = "patricktotzke@gmail.com" diff --git a/alot/commands/globals.py b/alot/commands/globals.py index 65609996..36e99207 100644 --- a/alot/commands/globals.py +++ b/alot/commands/globals.py @@ -603,8 +603,9 @@ class ComposeCommand(Command): sender = self.envelope.get('From') name, addr = email.Utils.parseaddr(sender) account = settings.get_account_by_address(addr) - self.envelope.sign = account.sign_by_default - self.envelope.sign_key = account.gpg_key + if account: + self.envelope.sign = account.sign_by_default + self.envelope.sign_key = account.gpg_key # get missing To header if 'To' not in self.envelope.headers: |