Digest item body template overwritten with digest body when saving

I confirm this.
Moreover, two digest mails without !bodies rendered were sent to me, one after 1 hour and 20 minutes the other. And my cron runs every 20 minutes.

Argh, there are at least two bugs in this code...

This patch will help (no cvs commit, because it needs to become more robust).

@samuelet: I didn't see your reply before and I don't quite understand what you mean. Please try this patch and if the issue persists, then explain it in more details.

P.S. The best way to recover from the digest template mess is to delete
subscriptions-digest from {mail_edit}, and
subscriptions-digest and subscriptions-digest-separator from {subscriptions_mail_edit}

This will restore the default digest templates.

Yes, patch works.
About my previuos post, !bodies were not rendered (i mean replaced with the real node body) simply because !bodies is a variable only in the mail_edit digest body section (it was in the item body section because of the bug).
About time, i referred to the sent interval for my subscriptions, which is 86400, so it was strange for me to receive two notification mails in 1 hour and 20 minutes (five cron runs on my drupal site).
Could they be generated by different type of subscriptions (i mean one from content type subscription and the other from taxonomy subscription)?

Thanks for the clarification.

As for the Send Interval, please see http://drupal.org/node/204874...