-#ifdef USE_NNTP
- if (!option (OPTNEWSSEND)) {
-#endif
- if (eightbit && option (OPTUSE8BITMIME))
- args = add_option(args, &argslen, &argsmax, "-B8BITMIME");
-
- if (option (OPTENVFROM)) {
- address_t *f = EnvFrom;
- if (EnvFrom)
- f = EnvFrom;
- else if (from && !from->next)
- f = from;
- if (f) {
- args = add_option (args, &argslen, &argsmax, "-f");
- args = add_args (args, &argslen, &argsmax, f);
- }
- }
- if (MTransport.dsn_notify) {
- args = add_option (args, &argslen, &argsmax, "-N");
- args = add_option (args, &argslen, &argsmax, MTransport.dsn_notify);
- }
- if (MTransport.dsn_return) {
- args = add_option (args, &argslen, &argsmax, "-R");
- args = add_option (args, &argslen, &argsmax, MTransport.dsn_return);
+ if (eightbit && MTransport.use_8bitmime)
+ args = add_option(args, &argslen, &argsmax, "-B8BITMIME");
+
+ if (MTransport.use_envelope_from) {
+ address_t *f = MTransport.envelope_from_address;
+ if (!f && from && !from->next)
+ f = from;
+ if (f) {
+ args = add_option (args, &argslen, &argsmax, "-f");
+ args = add_args (args, &argslen, &argsmax, f);