varkon fixed upstream
textmail fixed upstream