Restore send and autocomplete master

@jancborchardt @bartv2 @VicDeo @sebastian-schmid feedback more that welcome!