Sending S/MIME encrypted messages fails

When trying to send an S/MIME encrypted message I get S/MIM

Wed, 07 Mar 2012 14:56:52 +0000

When trying to send an S/MIME encrypted message I get S/MIME error: invalid e-mail and the following log entry WARN: HORDE [imp] PHP ERROR: strlen() expects parameter 1 to be string, array given [pid 8904 on line 150 of "/data/pear/php/Horde/Mail/Rfc822.php"] Dirty fix attached.

Changes have been made in Git (master): commit f438845b7cdc

Wed, 07 Mar 2012 20:31:37 +0000

Changes have been made in Git (master): commit f438845b7cdc8863579e27584ee642aec6e53d16 Author: Michael M Slusarz Date: Wed Mar 7 13:31:12 2012 -0700 Bug #11059: Yet more botched merge fixes. imp/lib/Compose.php | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) http://git.horde.org/horde-git/-/commit/f438845b7cdc8863579e27584ee642aec6e53d16

Changes have been made in Git (develop): commit f438845b7cd

Thu, 08 Mar 2012 01:09:10 +0000

Changes have been made in Git (develop): commit f438845b7cdc8863579e27584ee642aec6e53d16 Author: Michael M Slusarz Date: Wed Mar 7 13:31:12 2012 -0700 Bug #11059: Yet more botched merge fixes. imp/lib/Compose.php | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) http://git.horde.org/horde-git/-/commit/f438845b7cdc8863579e27584ee642aec6e53d16