diff --git a/mbuni/mmlib/mms_uaprof.c b/mbuni/mmlib/mms_uaprof.c
index 22af489..dd3b03e 100644
--- a/mbuni/mmlib/mms_uaprof.c
+++ b/mbuni/mmlib/mms_uaprof.c
@@ -617,8 +617,7 @@ static void remove_object(MIMEEntity *m, Octstr *ctype)
 
 static void mktmpfname(char fname[])
 {
-     /* We are not parameterising tmp dir yet. */
-     sprintf(fname, "/tmp/t%ld.%ld.%ld", random(), (long)getpid(), (long)time(NULL));     
+     tmpname(fname);
 }
 
 static Octstr *mknewname(Octstr *oldname, char *ext)
diff --git a/mbuni/todo b/mbuni/todo
index d3ba44e..755da54 100644
--- a/mbuni/todo
+++ b/mbuni/todo
@@ -1,9 +1,8 @@
 - correct handling of sender-visibility flag when receiving message (and also use correct address for billing. no spoofing).
 - In content adaptation: Colour depth adjustment
-- Need to parameterise some values: tmp dir, response messages (say on failed content adaptation)
+- Need to parameterise some values: response messages (say on failed content adaptation)
 - Test suite
 - Correct handling of unrecognised mms headers. spec says pass them un-changed.
-
 - Queue module needs to be de-coupled slightly from storage, so that mmsproxy can run on a separate box
   but be able to initiate queue writes/reads over network. Hence pieces can run on separate boxes 
   (with mmsrelay providing network service for queue functions)