diff --git a/src/bin/gravatar.c b/src/bin/gravatar.c
index 758e904..fca8224 100644
--- a/src/bin/gravatar.c
+++ b/src/bin/gravatar.c
@@ -49,12 +49,7 @@ media_add(Evas_Object *obj, Gravatar *g)
    int tmpfd;
    Ecore_Con_Url *url;
 
-#ifdef _WIN32
-   snprintf(buf, sizeof(buf), "%s/expressXXXXXX.png", evil_tmpdir_get());
-#else
-   snprintf(buf, sizeof(buf), "/tmp/expressXXXXXX.png");
-#endif
-   tmpfd = mkstemps(buf, 4);
+   tmpfd = eina_file_mkstemp("express", &buf);
 
    g->img_file = eina_stringshare_add(buf);
    g->tmpfd = tmpfd;