--- a/thesis/tex/4-MasqmailsFuture.tex	Sun Jan 04 10:27:30 2009 +0100
+++ b/thesis/tex/4-MasqmailsFuture.tex	Sun Jan 04 10:28:40 2009 +0100
@@ -305,7 +305,8 @@
 
 \begin{figure}
 	\begin{center}
-		\input{input/masqmail-arch.tex}
+		%\input{input/masqmail-arch.tex}
+		\includegraphics[scale=0.75]{img/callgraph.eps}
 	\end{center}
 	\caption{Call graph of \masqmail\ to show its internal structure}
 	\label{fig:masqmail-arch}
@@ -385,7 +386,7 @@
 
 Security, extendability, and the other quality properties appear to have crucial importance in this decision. If they are important for future versions of \masqmail, a new design is a must.
 
-\person{Graff} and \person{van Wyk} describe the situation best: ``[I]n today's world, your software is likely to have to operate in a very hostile security environment.'' \cite{graff05} An old-fashioned \mta\ depends, for sure, on a dieing branch, called \name{trusted envrironments}. And nothing other than a fresh and better design will help to survive.
+\person{Graff} and \person{van Wyk} describe the situation best: ``[I]n today's world, your software is likely to have to operate in a very hostile security environment.'' \cite{graff03} An old-fashioned \mta\ depends, for sure, on a dieing branch, called \name{trusted envrironments}. And nothing other than a fresh and better design will help to survive.
 
 The suggested further development on \masqmail\ is: First add the most needed features, being authentication and encryption, to the current code base. This is the short time goal. Second---and this is the long time goal---design a new architecture that satisfies the requirements identified, especially the quality requirements. The implementation of this design shall then, after being usable and throughoutly tested, superseed the old \masqmail.