Rewrite password recovery system

Now we have major problems with current password recovery system:
1) Password is changed immediately after entering valid email in password recovery form (so User1 can reset password for User2).
2) Password recovering email contains non-encrypted password.

So procedure for recovering password should contains following steps:
1. User following forum link for recovering password and gets to page where she should enter own email.
2. User receives letter like:

Hi, User!
it seems you want recover your password. Go to following link to proceed: http://site.com/password/reset?SECRETRANDOMCODE
If you didn't ask for recovering - just ignore this letter.

3. If user following link from email - she opens page with two input fields (new password and password confirmation) and button "Save"
Current user password should not be reset until she enters valid data in this fields and presses "Save" button.
4. After user entered valid data and saved it - she should be redirected to the main page as logged user.

Notes
1. Page http://site.com/password/reset should be only accessible with unique parameter SECRETRANDOMCODE. In other cases (including incorrect SECRETRANDOMCODE) she should receive warning message like "Incorrect link for recovering password. Try to use http://site.com/password/restore to recover your password."
2. SECRETRANDOMCODE is generated as random symbol sequence everytime when user enters valid email for password recovering
3. After succesfully setting new password SECRETRANDOMCODE should be deactivated (i.e. if user following link with it - she should receive warning message like at point 1).