diff --git a/pgweb/lists/forms.py b/pgweb/lists/forms.py
index 36185b05..0227853f 100644
--- a/pgweb/lists/forms.py
+++ b/pgweb/lists/forms.py
@@ -7,7 +7,5 @@ class SubscribeForm(forms.Form):
 
 	email = forms.EmailField(max_length=100,required=True,label="Email address")
 	action = forms.ChoiceField(required=True, choices=(('subscribe','Subscribe'),('unsubscribe','Unsubscribe')))
-	receive = forms.BooleanField(required=False, label="Receive mail", initial=True)
-	digest = forms.BooleanField(required=False, label="Digest only")
 	lists = forms.ModelChoiceField(required=True, queryset=MailingList.objects.filter(active=True), label="Mailinglist")
 
diff --git a/pgweb/lists/views.py b/pgweb/lists/views.py
index d4faef1a..07f97482 100644
--- a/pgweb/lists/views.py
+++ b/pgweb/lists/views.py
@@ -18,20 +18,9 @@ def subscribe(request):
 		if form.is_valid():
 			if form.cleaned_data['action'] == 'subscribe':
 				mailsubject = "subscribe"
-				# Default is get mail and not digest, in which case we send a regular
-				# subscribe request. In other cases, we send subscribe-set which also
-				# sets those flags.
-				if form.cleaned_data['receive'] and not form.cleaned_data['digest']:
-					mailtxt = "subscribe %s\n" % form.cleaned_data['lists']
-				else:
-					tags = []
-					if not form.cleaned_data['receive']:
-						tags.append('nomail')
-					if form.cleaned_data['digest']:
-						tags.append('digest')
-
-					mailtxt = "subscribe-set %s %s\n" % (form.cleaned_data['lists'],
-														",".join(tags))
+				# We currently only support get mail, no digest.
+				# So send a regular subscribe request.
+				mailtxt = "subscribe %s\n" % form.cleaned_data['lists']
 			else:
 				mailtxt = "unsubscribe %s\n" % form.cleaned_data['lists']
 				mailsubject = "unsubscribe"