Autofill subject when replying to messages
Fix some apache warnings and notices
Merge remote-tracking branch 'upstream/master'
Merge branch 'threads' de David Rodriguez to master
 Please enter a commit message to explain why this merge is necessary,