Invoice and delivery addresses as standard

Is there any way that the invoice address and the delivery address can be shown on the invoices without having to select the tick box on the generate invoice screen each time? It would be ideal that if a customer has both an invoice address and a delivery address in the client information, that both appear on the invoices automatically.