If it were my bike, I'd just replace the fork with one having similar crown-to-axle and rake dimensions, and with a threaded steerer tube of the proper length for the frame's head tube (~40mm longer than the head tube) and having 1.5mm walls (to take a 22.2mm quill stem). The friend you got the bike from sounds a bit ham-fisted