reverting back
Revert "reverting back"

This reverts commit ea901c1f3d9619e1da2b05bf97edfb5afa53f0f2.
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
various changes to 'messages expire' pull request
Refactored some table items to remove the universal unreadable variable 'new_item'
further work on 'messages expire' feature
delete class_sqlThread.py.orig
Merge pull request #548 from Atheros1/master

Message Expire
Updated to Message Expires - version
Fix #472
Fix #541
Fix #544
Merge pull request #550 from Atheros1/master

Various fixes
Fix #545
Merge pull request #551 from Atheros1/master

Fix #545
Merge pull request #547 from neko259/master

Refactored some table items to remove the universal unreadable variable ...
Refactoring main qt module. Moved popup menus initialization to separate methods, simplified inbox loading and moved magic strings to the model scope constants so they won't be created every time.
minor style changes to previous commit
Merge pull request #553 from Atheros1/master

Some UI code refactoring