They met in Rivendell and agreed to wed in Lothlorien. Judging by those quotations Essex provides, 'Gorn himself was inconsistent.
There is one more very funny moment in Moria. Right after Gandalf says 'I have no memory of this place', Aragorn, while smoking, turns to Boromir and makes this little mocking noise, a sort of snort to indicate 'What a stupid wizard!'
Makes me laugh every time.