Yes, there will be another version coming out some time next year. It will propably be marketed as an "unrated version" or "the director's (uncut) version" consisting of so-called R rated material (steamier love scenes and more violence).
Another DVD is mentioned by Doug Liman in his commentary track.
Allein im Trailer kamen schließlich etliche Actionszenen vor, die im (bisherigen) Film nicht drin waren... 😉