Citimortgage and reaffirmation

i bought my home in 2002. i filed a chapter 7 in feb 2004. it was discharged in june 2004. i did not file on my home. i was current with my mortgage when i filed. my mortgage was with abn amro at that time and remained with them until 9/15/2007 when abn amro sold my loan to citimortgage. they started to report to all 3 of my credit bureaus that i had filed chapter 7 on my home. i am fighting with them to resolve this but they keep stating that i didn't have a reaffirmation of the home. i have the paper that was included in my bankruptcy stating my statement of intention to reaffirm the debt. i am trying to refinance and they are screwing it all up not to mention that my credit cards have raised my interest rates due to what they are reporting. i know that some new bankruptcy law was in regards to reaffirmation was passed in 2005 but that was after my bankruptcy. citimortgage is stating that i need to reopen my bankruptcy so that it can be reaffirmed. i am confused and frustrated. i am not savy on the laws for sure but this makes no sense to me that i have to reopen something that happened 5 years ago. my account was current throughout the bankruptcy and i indicated on my statement of intentions that i wished to retain the property so what is the deal??? when i ask citimortgage they state that they have the right to report it this way to the credit bureaus and that until i reopen my bankruptcy and reaffirm with them it will remain on my credit reports. of course it costs money to do this and time. there goes my refinance. and yeah if i reopen is it going to change the discharge date?