N900 swipe to answer/unlock when calling
 

Is there an app/hack for this?
I find it annoying that when I receive a call that the screen will lock and I have to unlock just to answer. I'm looking at my contacts or writing an email and then the screen locks for the call, i don't mind it switching to the call like the N97 did, but just flat locking and having a 2 step process to answer a call is a bit frustrating. Any ideas?
Thanks...