diff --git a/corbeau b/corbeau
index 5fefda03..141bc82b 100755
--- a/corbeau
+++ b/corbeau
@@ -1,18 +1,25 @@
 #! /bin/sh
 
-formail -I "Received" \
-        -I "From" \
-	-I "X-Original-To" \
-	-I "Delivered-To" \
-	-I "To" \
-	-I "Message-ID" \
-	-I "User-Agent" \
-	-I "X-Newsreader" \
-	-I "Organization" \
-	-I "Return-Path" \
-	-A "Message-Id: $(date '+<corbeau.%s@crans.org>')" \
-	-A "From: corbeau@crans.org" \
-	-A "Newsgroups: crans.radio-ragots" \
-	-A "Path: Corbeau" | \
-    rnews
+TEMP="$(mktemp)"
 
+trap "rm -f ${TEMP}" EXIT
+
+spamc -E > ${TEMP}
+if [[ $? == 0 ]]; then
+  cat ${TEMP} | \
+  formail -I "Received" \
+          -I "From" \
+       	-I "X-Original-To" \
+       	-I "Delivered-To" \
+       	-I "To" \
+       	-I "Message-ID" \
+       	-I "User-Agent" \
+       	-I "X-Newsreader" \
+       	-I "Organization" \
+       	-I "Return-Path" \
+       	-A "Message-Id: $(date '+<corbeau.%s@crans.org>')" \
+       	-A "From: corbeau@crans.org" \
+       	-A "Newsgroups: crans.radio-ragots" \
+       	-A "Path: Corbeau" | \
+   rnews
+fi