Printing/Emailing Contribution Receipt uses the Membership receipt template and not the Contribution Receipt

When searching for a contribution and selecting contributions, then clicking the drop down option to Print / Email Contribution receipt. The system generates a membership receipt when the contribution or donor has no tie to memberships. If no membership types are defined it throws an error saying no membership ID found. Here is the forum that led to finding this bug http://forum.civicrm.org/index.php/topic,21905.msg94812.html#msg94812 .