Moved messages to locale file and updated how draft completion is handled.