Remove "Gift Message for this Order" from Magento emails

In Magento the new gift message facility appears to be missing some relevant lines from the templates to be able to disable the "Gift Message for this Order" area from the email template. Thankfully, its an extremely quick fix. Open up ./app/design/frontend/base/default/template/email/order/items.phtml and wrap the final table with a conditional statement.

The resulting file will then look something like this
getOrder() ?>
getAllItems() as $_item): ?>
 getParentItem()) continue; else $i++; ?>
 getItemHtml($_item) ?>

 getChildHtml('order_totals') ?>
__('Item') ?> __('Sku') ?> __('Qty') ?> __('Subtotal') ?>

getGiftMessageId() && $_giftMessage = $this->helper('giftmessage/message')->getGiftMessage($_order->getGiftMessageId())): ?>
__('Gift Message for this Order') ?>
__('From:'); ?> htmlEscape($_giftMessage->getSender()) ?>
__('To:'); ?> htmlEscape($_giftMessage->getRecipient()) ?>
__('Message:'); ?>
htmlEscape($_giftMessage->getMessage()) ?>