Which prophet is most closely associated with the prophecy that Elijah would return before the 'great and dreadful day of the Lord'?

A Malachi B Joel C Haggai D Amos