Is the following sentence grammatically correct?
My friendly neighbor, from whom I borrowed a ladder last night, is a nurse;
The correct answer seems to suggest that
My friendly neighbor, whom I borrowed a ladder from last night, is a nurse.
I would prefer the first sentence, but is it grammatically correct?