align code with newer GNU social
align code with newer GNU social

netzkombinat/Qvitter,hannesmannerheim/qvitter,mitchellurgero/Qvitter,mitchellurgero/Qvitter,netzkombinat/Qvitter,hannesmannerheim/qvitter