Merge branch 'encode-rfc2047'

diff --cc Makefile.am
Simple merge

diff --cc h/prototypes.h
Simple merge

diff --cc sbr/addrsbr.c
Simple merge

diff --cc uip/fmttest.c
Simple merge

diff --cc uip/post.c
Simple merge