static const char *RCSID = "$Id: spamdetect.cpp,v 1.2 2007-11-21 15:14:26 arjen Exp $";
#include <fstream>
-#include <AXE/String.h>
+#include <String.h>
#include <syslog.h>
#include <getopt.h>
String header;
int state = 0;
- regex fwd_header("---- Original Message -----");
+ // From here, the original spam starts. Something like
+ // -------- Forwarded Message -------- or -------- Original Message --------
+
+ regex fwd_header("---- .+ Message -----");
regex received("^Received:");
regex from("^From:");
regex returnpath("^Return-Path:");