merge of 'a3b799159abc70880dcdddcf22236376e1646a5d'

and 'e3472120a6c1a2370d18a7cf44e52e53f93b7323'

Monotone-Parent: a3b799159abc70880dcdddcf22236376e1646a5d
Monotone-Parent: e3472120a6c1a2370d18a7cf44e52e53f93b7323
Monotone-Revision: d4394b4b92fdfda720d67698c9fbadc75787ad18

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2012-02-11T06:50:52
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Francis Lachapelle 2012-02-11 06:50:52 +00:00
commit e8abd08d31

View file

@ -219,9 +219,7 @@
- (NSString *) signature
{
NSString *signature, *mailSignature;
SOGoUserDefaults *ud;
ud = [[context activeUser] userDefaults];
signature = [[sourceMail mailAccountFolder] signature];
if ([signature length])
mailSignature = [NSString stringWithFormat: @"-- \n%@", signature];