You are viewing your messages sorted by "grouped". To change it, go to View > Sort by, then and select either Threaded or Unthreaded. What you had before was Unthreaded if messages are just listed chronologically.
> I also have a new folder added under "Local Folders" labeled "nstmp".
> The folder is empty so I can just delete that but after hunting around a
> bit I still haven't found a way to return my Inbox to it's original
Yeah, just delete the nstmp folder: http://kb.mozillazine.org/Nstmp_folders
-Ian M.