Estimate message and reminders carry to invoice

[safesimple]

I am having an issue whenever I convert an accepted estimate to an invoice the invoice message is the text in the "message" box gets carried over from the estimate instead of inserting the text that is set as default for the invoice message. If I create a new invoice (not from an estimate) the default invoice message shows the correct text.

I am also having an issue with the reminders not being the default invoice reminders when converting an estimate to invoice. so with these two issues, every time I convert an estimate to invoice I have to manually adjust the message text and the email reminders to match my default invoice settings.

Is there any fix for this since it is time consuming to make the edits and even more time consuming to have to create a new invoice every time an estimate is accepted instead of simply converting it to an invoice?